OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 5294aafe: am 99df4847: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 24 Apr 2013 19:45:22 +0000 (12:45 -0700)]
am 5294aafe: am 99df4847: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '5294aafe14c5625d408045c48e0baa8f4cb22b51':
  Import translations. DO NOT MERGE

11 years agoam 42b21292: am 2b3e35df: Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 19:45:21 +0000 (12:45 -0700)]
am 42b21292: am 2b3e35df: Import translations. DO NOT MERGE

* commit '42b2129215bda42fcb63c7ee6162056698cb6c2c':
  Import translations. DO NOT MERGE

11 years agoam 99df4847: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 24 Apr 2013 19:43:33 +0000 (12:43 -0700)]
am 99df4847: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '99df484788523fdcc54483bc92ab3ed49d8bb3c5':
  Import translations. DO NOT MERGE

11 years agoam 2b3e35df: Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 19:43:32 +0000 (12:43 -0700)]
am 2b3e35df: Import translations. DO NOT MERGE

* commit '2b3e35dfea337fc5f2c5e42c633519e325e601b0':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 24 Apr 2013 19:41:38 +0000 (19:41 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 24 Apr 2013 19:41:24 +0000 (19:41 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 17:53:25 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2d06b618ba978274d1d5cee5e94730c8965df991
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 17:53:05 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic55d840aa70552899c4644c650ebe2683f05c4dc
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 17:51:52 +0000 (10:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic6cd127deb6514f9a9d614bb53b4518983af94d8
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 17:51:12 +0000 (10:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie13b166aed21b53e43ab04a9c45ee3fc36d4d533
Auto-generated-cl: translation import

11 years agoam 68be3944: am 1648b0c4: am 0c71308c: Merge "interruptible renderer" into gb-ub...
John Hoford [Wed, 24 Apr 2013 01:24:43 +0000 (18:24 -0700)]
am 68be3944: am 1648b0c4: am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce

* commit '68be3944511cbd9deec7033930bc223aedf6645d':
  interruptible renderer

11 years agoam 1648b0c4: am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 01:22:46 +0000 (18:22 -0700)]
am 1648b0c4: am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce

* commit '1648b0c40fd9d765ac1b255c03674fdc4ce70bd1':
  interruptible renderer

11 years agoam 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 01:18:50 +0000 (18:18 -0700)]
am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce

* commit '0c71308c9d2a72d4a3faf00242707de773d5beba':
  interruptible renderer

11 years agoMerge "interruptible renderer" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 01:17:02 +0000 (01:17 +0000)]
Merge "interruptible renderer" into gb-ub-photos-bryce

11 years agoam 029e1531: am 68fa800e: am 7d62e546: Use FULL_SENSOR for unlocked orientation.
Angus Kong [Wed, 24 Apr 2013 00:34:41 +0000 (17:34 -0700)]
am 029e1531: am 68fa800e: am 7d62e546: Use FULL_SENSOR for unlocked orientation.

* commit '029e1531c0b5838397f38bc7554e2d346864b6b2':
  Use FULL_SENSOR for unlocked orientation.

11 years agoam 68fa800e: am 7d62e546: Use FULL_SENSOR for unlocked orientation.
Angus Kong [Wed, 24 Apr 2013 00:32:51 +0000 (17:32 -0700)]
am 68fa800e: am 7d62e546: Use FULL_SENSOR for unlocked orientation.

* commit '68fa800eb82468072f94e6dbbd4b63d3ccb7075e':
  Use FULL_SENSOR for unlocked orientation.

11 years agoam 7d62e546: Use FULL_SENSOR for unlocked orientation.
Angus Kong [Wed, 24 Apr 2013 00:30:30 +0000 (17:30 -0700)]
am 7d62e546: Use FULL_SENSOR for unlocked orientation.

* commit '7d62e546b3b9eedc1f5c9d8f3ee644025f554fe3':
  Use FULL_SENSOR for unlocked orientation.

11 years agoUse FULL_SENSOR for unlocked orientation.
Angus Kong [Tue, 23 Apr 2013 23:44:33 +0000 (16:44 -0700)]
Use FULL_SENSOR for unlocked orientation.

bug:8689453
Change-Id: Ia81d970772f091fbd9bec142acfd5e9f84e0a0fb

11 years agointerruptible renderer
John Hoford [Tue, 23 Apr 2013 22:55:51 +0000 (15:55 -0700)]
interruptible renderer

bug:8632908
Change-Id: I4df59fb0c82370491d953292fd1cd17443054ab3

11 years agoam e6db2801: am 88e3486d: am 8600c562: Fix to check if crop activity got bad bitmap.
Ruben Brunk [Tue, 23 Apr 2013 22:01:45 +0000 (15:01 -0700)]
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.

11 years agoam bc084e34: am e4dd20bd: am ae52b3e3: Fixes video mode indicators by resetting them...
Sascha Haeberling [Tue, 23 Apr 2013 22:01:35 +0000 (15:01 -0700)]
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.

11 years agoam 88e3486d: am 8600c562: Fix to check if crop activity got bad bitmap.
Ruben Brunk [Tue, 23 Apr 2013 18:54:10 +0000 (11:54 -0700)]
am 88e3486d: am 8600c562: Fix to check if crop activity got bad bitmap.

* commit '88e3486dc30f428d47ce198af47f9f2d83911d83':
  Fix to check if crop activity got bad bitmap.

11 years agoam 8600c562: Fix to check if crop activity got bad bitmap.
Ruben Brunk [Tue, 23 Apr 2013 18:52:22 +0000 (11:52 -0700)]
am 8600c562: Fix to check if crop activity got bad bitmap.

* commit '8600c562b8ed0f636bc966a8aac83dc90326f0fb':
  Fix to check if crop activity got bad bitmap.

11 years agoFix to check if crop activity got bad bitmap.
Ruben Brunk [Tue, 23 Apr 2013 17:29:25 +0000 (10:29 -0700)]
Fix to check if crop activity got bad bitmap.

Bug: 8692297
Change-Id: I1900c45c71b3d1c6203e4d25a7ad5354f409fcf2

11 years agoam e4dd20bd: am ae52b3e3: Fixes video mode indicators by resetting them on init.
Sascha Haeberling [Tue, 23 Apr 2013 17:27:40 +0000 (10:27 -0700)]
am e4dd20bd: am ae52b3e3: Fixes video mode indicators by resetting them on init.

* commit 'e4dd20bd33456e401a1d5b23f8e4438621f91984':
  Fixes video mode indicators by resetting them on init.

11 years agoam ae52b3e3: Fixes video mode indicators by resetting them on init.
Sascha Haeberling [Tue, 23 Apr 2013 17:25:52 +0000 (10:25 -0700)]
am ae52b3e3: Fixes video mode indicators by resetting them on init.

* commit 'ae52b3e3f0f356e1b91e883729d0d82cb40d7a42':
  Fixes video mode indicators by resetting them on init.

11 years agoFixes video mode indicators by resetting them on init.
Sascha Haeberling [Tue, 23 Apr 2013 16:58:51 +0000 (09:58 -0700)]
Fixes video mode indicators by resetting them on init.

  Bug: 8696004

Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a

11 years agoam 6b494fe2: am 7ec05edd: am 86d622f7: Bump up the version number to 1.1.40011
Bart Sears [Tue, 23 Apr 2013 11:45:49 +0000 (04:45 -0700)]
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

11 years agoam ec61729f: am 7f899d25: am d313bb0a: Merge "Make sure we don\'t add the pano sharin...
Sascha Haeberling [Tue, 23 Apr 2013 11:45:48 +0000 (04:45 -0700)]
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.

11 years agoam 29e6e15e: am 123dc81c: am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub...
Ruben Brunk [Tue, 23 Apr 2013 11:45:47 +0000 (04:45 -0700)]
am 29e6e15e: am 123dc81c: am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce

* commit '29e6e15ed24ca0b79ac9b7dd729476f360ff0ed6':
  Fix wallpaper crop UI.

11 years agoam 93d2a3b4: am c0bb6532: am 7706d294: Merge "Refactor the methods for changing the...
Sascha Haeberling [Tue, 23 Apr 2013 11:45:47 +0000 (04:45 -0700)]
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.

11 years agoam 005e9bb2: am cd3f1cb9: am 15b83326: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 23 Apr 2013 11:45:46 +0000 (04:45 -0700)]
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

11 years agoam 44fc9793: am 10d495c2: am 6fe2995e: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 23 Apr 2013 11:45:46 +0000 (04:45 -0700)]
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

11 years agoam cfba92e7: am 89434fb2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Tue, 23 Apr 2013 11:45:45 +0000 (04:45 -0700)]
am cfba92e7: am 89434fb2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'cfba92e7038143ac7a6d72c191356803219dded5':
  Import translations. DO NOT MERGE

11 years agoam e3f4f4a0: (-s ours) am 0f609692: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 23 Apr 2013 11:45:45 +0000 (04:45 -0700)]
am e3f4f4a0: (-s ours) am 0f609692: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'e3f4f4a0013080fb83d99ce73b847337d281b9a3':
  Import translations. DO NOT MERGE

11 years agoam 381e21c7: am 21dfb866: am 9c48a6c3: Fixes build. Removes dead code.
Ruben Brunk [Tue, 23 Apr 2013 10:54:29 +0000 (03:54 -0700)]
am 381e21c7: am 21dfb866: am 9c48a6c3: Fixes build. Removes dead code.

* commit '381e21c709108e89ac245e7eec86f59ce38b8d15':
  Fixes build. Removes dead code.

11 years agoam 189989c7: am ed0ee835: am 1365eec6: Merge "Fix orientation changes for wallpaper...
Ruben Brunk [Tue, 23 Apr 2013 10:54:28 +0000 (03:54 -0700)]
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.

11 years agoam 1bdbd362: am 0ce21047: am 4a6dc2b1: Merge "Reenables crop aspect ratio menu."...
Ruben Brunk [Tue, 23 Apr 2013 10:54:28 +0000 (03:54 -0700)]
am 1bdbd362: am 0ce21047: am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce

* commit '1bdbd36255ae93fb4cd3c48f8f4ef326e112e973':
  Reenables crop aspect ratio menu.

11 years agoam 219f3663: am 440e43ed: am 608f7c98: Merge "More menu fixes" into gb-ub-photos...
Michael Kolb [Tue, 23 Apr 2013 10:54:27 +0000 (03:54 -0700)]
am 219f3663: am 440e43ed: am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce

* commit '219f36635af3b0f724f0a8b990ba075bd8e84407':
  More menu fixes

11 years agoam 250829a4: am 33109243: am d6e6533a: Merge "Fix for camera switcher hard to hit...
Doris Liu [Tue, 23 Apr 2013 10:54:26 +0000 (03:54 -0700)]
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

11 years agoam da69d98a: am 5d19a1c3: am ed689873: Merge "Fix camera buttons showing up at wrong...
Doris Liu [Tue, 23 Apr 2013 10:54:26 +0000 (03:54 -0700)]
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

11 years agoam 5b3b0b50: am 5dccb63e: am ca6f04e2: Remove dead code
Bobby Georgescu [Tue, 23 Apr 2013 10:54:25 +0000 (03:54 -0700)]
am 5b3b0b50: am 5dccb63e: am ca6f04e2: Remove dead code

* commit '5b3b0b50d50d801fd1bcd8a91080ef81ffa0935f':
  Remove dead code

11 years agoam 166419fa: am ae1b2a55: am d97733b2: Strings update
nicolasroard [Tue, 23 Apr 2013 10:54:25 +0000 (03:54 -0700)]
am 166419fa: am ae1b2a55: am d97733b2: Strings update

* commit '166419fa3215507c8b2b058e39b250f730333637':
  Strings update

11 years agoam 3f9a9b48: am 9b407b5f: am bb894c4f: Merge "String updates." into gb-ub-photos...
Nicolas Roard [Tue, 23 Apr 2013 10:54:24 +0000 (03:54 -0700)]
am 3f9a9b48: am 9b407b5f: am bb894c4f: Merge "String updates." into gb-ub-photos-bryce

* commit '3f9a9b48bb2424db7eaf8a75e8aaf0fc9a2d10d0':
  String updates.

11 years agoam ac42ec56: am 36affdf2: am 237216ee: Rename scenemode AUTO to NONE
Michael Kolb [Tue, 23 Apr 2013 10:54:24 +0000 (03:54 -0700)]
am ac42ec56: am 36affdf2: am 237216ee: Rename scenemode AUTO to NONE

* commit 'ac42ec56620acf0d03e5d99949d8f43b40cfed08':
  Rename scenemode AUTO to NONE

11 years agoam 2229db8a: am 413fa970: am f53eea80: Merge "Ensure consistent image thumbnail handl...
Ruben Brunk [Tue, 23 Apr 2013 10:54:23 +0000 (03:54 -0700)]
am 2229db8a: am 413fa970: am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce

* commit '2229db8a2fd622bc4b7131b21b43af20c2636572':
  Ensure consistent image thumbnail handling.

11 years agoam 9ca05418: am 6e2b9c13: am afc46d5a: Merge "Fix saved video timestamps." into gb...
Ruben Brunk [Tue, 23 Apr 2013 10:54:22 +0000 (03:54 -0700)]
am 9ca05418: am 6e2b9c13: am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce

* commit '9ca054186939d276db728463e5af00acc0b33cec':
  Fix saved video timestamps.

11 years agoam 4d2bfb34: am 41d628b3: Merge commit \'91d26f6c\' into jb-mr2-dev
Chad Jones [Tue, 23 Apr 2013 10:54:22 +0000 (03:54 -0700)]
am 4d2bfb34: am 41d628b3: Merge commit \'91d26f6c\' into jb-mr2-dev

* commit '4d2bfb343c2ea3814ce5af2439362412516e5744':

11 years agoam 7ec05edd: am 86d622f7: Bump up the version number to 1.1.40011
Bart Sears [Tue, 23 Apr 2013 10:52:30 +0000 (03:52 -0700)]
am 7ec05edd: am 86d622f7: Bump up the version number to 1.1.40011

* commit '7ec05edd5e9fa2854a23d99ef3db4ee05787ccb6':
  Bump up the version number to 1.1.40011

11 years agoam 7f899d25: am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in...
Sascha Haeberling [Tue, 23 Apr 2013 10:51:48 +0000 (03:51 -0700)]
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.

11 years agoam 123dc81c: am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce
Ruben Brunk [Tue, 23 Apr 2013 10:51:46 +0000 (03:51 -0700)]
am 123dc81c: am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce

* commit '123dc81ca52754eb9ed0fe873c7f71fe2fc6cb3f':
  Fix wallpaper crop UI.

11 years agoam c0bb6532: am 7706d294: Merge "Refactor the methods for changing the on-screen...
Sascha Haeberling [Tue, 23 Apr 2013 10:51:33 +0000 (03:51 -0700)]
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.

11 years agoam cd3f1cb9: am 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 23 Apr 2013 10:51:20 +0000 (03:51 -0700)]
am cd3f1cb9: am 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'cd3f1cb9402d75ba3f77c2238b24b1b5b2d15dcb':
  Import translations. DO NOT MERGE

11 years agoam 10d495c2: am 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 23 Apr 2013 10:51:16 +0000 (03:51 -0700)]
am 10d495c2: am 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '10d495c2ec88ae0ca7c388e2065ac470940c6169':
  Import translations. DO NOT MERGE

11 years agoam 89434fb2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Tue, 23 Apr 2013 10:51:15 +0000 (03:51 -0700)]
am 89434fb2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '89434fb2dff21f9d1d4e81f6e760a1e98a3d2f9d':
  Import translations. DO NOT MERGE

11 years agoam 0f609692: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Tue, 23 Apr 2013 10:51:15 +0000 (03:51 -0700)]
am 0f609692: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '0f609692766a2031baa2623ab6e1d29f69c71162':
  Import translations. DO NOT MERGE

11 years agoam 21dfb866: am 9c48a6c3: Fixes build. Removes dead code.
Ruben Brunk [Tue, 23 Apr 2013 10:50:22 +0000 (03:50 -0700)]
am 21dfb866: am 9c48a6c3: Fixes build. Removes dead code.

* commit '21dfb86667fcef76c642ee460c99effef1bd2b11':
  Fixes build. Removes dead code.

11 years agoam ed0ee835: am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into...
Ruben Brunk [Tue, 23 Apr 2013 10:50:22 +0000 (03:50 -0700)]
am ed0ee835: am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce

* commit 'ed0ee835d4191625f2c966a1803290dfb43f94d8':
  Fix orientation changes for wallpaper setter.

11 years agoam 0ce21047: am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos...
Ruben Brunk [Tue, 23 Apr 2013 10:50:21 +0000 (03:50 -0700)]
am 0ce21047: am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce

* commit '0ce21047ba69c4a5fb070be8dec969174e998916':
  Reenables crop aspect ratio menu.

11 years agoam 440e43ed: am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce
Michael Kolb [Tue, 23 Apr 2013 10:50:16 +0000 (03:50 -0700)]
am 440e43ed: am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce

* commit '440e43ed863a22ac4205b20835e6e67222c98fa0':
  More menu fixes

11 years agoam 33109243: am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub...
Doris Liu [Tue, 23 Apr 2013 10:50:14 +0000 (03:50 -0700)]
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

11 years agoam 5d19a1c3: am ed689873: Merge "Fix camera buttons showing up at wrong position...
Doris Liu [Tue, 23 Apr 2013 10:50:13 +0000 (03:50 -0700)]
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

11 years agoam 5dccb63e: am ca6f04e2: Remove dead code
Bobby Georgescu [Tue, 23 Apr 2013 10:50:13 +0000 (03:50 -0700)]
am 5dccb63e: am ca6f04e2: Remove dead code

* commit '5dccb63ecbcd869cdf06a306396c6726b726f778':
  Remove dead code

11 years agoam ae1b2a55: am d97733b2: Strings update
nicolasroard [Tue, 23 Apr 2013 10:50:12 +0000 (03:50 -0700)]
am ae1b2a55: am d97733b2: Strings update

* commit 'ae1b2a552cd76f66db4da3ac1713e4dbb584be4c':
  Strings update

11 years agoam 9b407b5f: am bb894c4f: Merge "String updates." into gb-ub-photos-bryce
Nicolas Roard [Tue, 23 Apr 2013 10:50:11 +0000 (03:50 -0700)]
am 9b407b5f: am bb894c4f: Merge "String updates." into gb-ub-photos-bryce

* commit '9b407b5fba68a82f98f3d71f48c7cffec161b3fe':
  String updates.

11 years agoam 36affdf2: am 237216ee: Rename scenemode AUTO to NONE
Michael Kolb [Tue, 23 Apr 2013 10:50:11 +0000 (03:50 -0700)]
am 36affdf2: am 237216ee: Rename scenemode AUTO to NONE

* commit '36affdf28ccc181c1151c757a57d7fdfe03ec254':
  Rename scenemode AUTO to NONE

11 years agoam 413fa970: am f53eea80: Merge "Ensure consistent image thumbnail handling." into...
Ruben Brunk [Tue, 23 Apr 2013 10:50:10 +0000 (03:50 -0700)]
am 413fa970: am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce

* commit '413fa9709da680b650c3c8d9ac4c5884a461fb46':
  Ensure consistent image thumbnail handling.

11 years agoam 6e2b9c13: am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce
Ruben Brunk [Tue, 23 Apr 2013 10:50:10 +0000 (03:50 -0700)]
am 6e2b9c13: am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce

* commit '6e2b9c136000dcb4bf38b5c89d67e0e10d6fd696':
  Fix saved video timestamps.

11 years agoam 41d628b3: Merge commit \'91d26f6c\' into jb-mr2-dev
Chad Jones [Tue, 23 Apr 2013 10:50:09 +0000 (03:50 -0700)]
am 41d628b3: Merge commit \'91d26f6c\' into jb-mr2-dev

* commit '41d628b3c5bbad3cf52bfc7fac47b7b14b91b8aa':

11 years agoam 86d622f7: Bump up the version number to 1.1.40011
Bart Sears [Tue, 23 Apr 2013 06:15:04 +0000 (23:15 -0700)]
am 86d622f7: Bump up the version number to 1.1.40011

* commit '86d622f79e9b72b78b7d9b34c66c6ed9d83c9ea5':
  Bump up the version number to 1.1.40011

11 years agoBump up the version number to 1.1.40011
Bart Sears [Tue, 23 Apr 2013 01:43:29 +0000 (18:43 -0700)]
Bump up the version number to 1.1.40011

Bug: 8607157
Change-Id: I7fc2c526228d9526b0af28181b6505173bbfbd7d

11 years agoam d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock...
Sascha Haeberling [Mon, 22 Apr 2013 23:57:10 +0000 (16:57 -0700)]
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.

11 years agoMerge "Make sure we don't add the pano sharing menu in the secure lock screen." into...
Sascha Haeberling [Mon, 22 Apr 2013 23:55:04 +0000 (23:55 +0000)]
Merge "Make sure we don't add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce

11 years agoam 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 23:54:04 +0000 (16:54 -0700)]
am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce

* commit '98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2':
  Fix wallpaper crop UI.

11 years agoMerge "Fix wallpaper crop UI." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 23:53:03 +0000 (23:53 +0000)]
Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce

11 years agoMake sure we don't add the pano sharing menu in the secure lock screen.
Sascha Haeberling [Mon, 22 Apr 2013 23:06:25 +0000 (16:06 -0700)]
Make sure we don't add the pano sharing menu in the secure lock screen.

  Bug: 8473022

Change-Id: Ie2221b6a660b7c9dc39cef89a509da4b2659adb3

11 years agoam 7706d294: Merge "Refactor the methods for changing the on-screen indicators."...
Sascha Haeberling [Mon, 22 Apr 2013 22:57:47 +0000 (15:57 -0700)]
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.

11 years agoMerge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos...
Sascha Haeberling [Mon, 22 Apr 2013 22:55:54 +0000 (22:55 +0000)]
Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce

11 years agoFix wallpaper crop UI.
Ruben Brunk [Mon, 22 Apr 2013 22:07:28 +0000 (15:07 -0700)]
Fix wallpaper crop UI.

Bug: 8687759
Change-Id: Ice32fdabdae585fc39e78ce1f3e7e1796c5d99b3

11 years agoam 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 22 Apr 2013 21:57:33 +0000 (14:57 -0700)]
am 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '15b83326d22b58058b745255aade9f9bf5c09111':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 22 Apr 2013 21:54:25 +0000 (21:54 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoam 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 22 Apr 2013 21:54:25 +0000 (14:54 -0700)]
am 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '6fe2995e44f38e7393ca4c12e5af5bf5b02d6297':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 22 Apr 2013 21:54:03 +0000 (21:54 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 22 Apr 2013 21:53:53 +0000 (21:53 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 22 Apr 2013 21:53:06 +0000 (21:53 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 22 Apr 2013 21:52:51 +0000 (21:52 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoRefactor the methods for changing the on-screen indicators.
Sascha Haeberling [Mon, 22 Apr 2013 21:27:36 +0000 (14:27 -0700)]
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

11 years agoam 9c48a6c3: Fixes build. Removes dead code.
Ruben Brunk [Mon, 22 Apr 2013 18:58:30 +0000 (11:58 -0700)]
am 9c48a6c3: Fixes build. Removes dead code.

* commit '9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1':
  Fixes build. Removes dead code.

11 years agoFixes build. Removes dead code.
Ruben Brunk [Mon, 22 Apr 2013 18:45:06 +0000 (11:45 -0700)]
Fixes build. Removes dead code.

Change-Id: Ieef56407304254235295d81e09e55f1cd69b87cb

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 18:32:48 +0000 (11:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibc399c5be99f22c4fc4fb1e42545a2eb574ae2d5
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 18:32:21 +0000 (11:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: I48df56ff30fe3834e152f051ac9ee30c36e69a15
Auto-generated-cl: translation import

11 years agoam 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos...
Ruben Brunk [Mon, 22 Apr 2013 18:32:20 +0000 (11:32 -0700)]
am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce

* commit '1365eec634694796c1e3432abff54dd658bd4641':
  Fix orientation changes for wallpaper setter.

11 years agoam 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 18:32:19 +0000 (11:32 -0700)]
am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce

* commit '4a6dc2b147af34ab4545f6f647b4038c64fc80d0':
  Reenables crop aspect ratio menu.

11 years agoMerge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 18:32:01 +0000 (18:32 +0000)]
Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 18:31:59 +0000 (11:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I29d0fd49904f33631aeb4f77e1e0174186d99e88
Auto-generated-cl: translation import

11 years agoMerge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 18:31:33 +0000 (18:31 +0000)]
Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 18:30:57 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: I042daabca1f112762baf91d91fd9d23cf24da9ec
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 18:30:26 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: I53e202c86e4d6850682879ca557129a8aa74f61b
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 18:29:49 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5792f361b2f301c4acf5ef80fd33d149acc081dd
Auto-generated-cl: translation import

11 years agoFix orientation changes for wallpaper setter.
Ruben Brunk [Mon, 22 Apr 2013 17:53:08 +0000 (10:53 -0700)]
Fix orientation changes for wallpaper setter.

Bug: 8670036
Change-Id: I44932bcc8cd8b89686186e42fa1eb2644af87b47