OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 2da0ddbc: am 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos...
Sascha Haeberling [Wed, 24 Apr 2013 20:29:54 +0000 (13:29 -0700)]
am 2da0ddbc: am 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce

* commit '2da0ddbc26d9fbb19c8c3abf70045b5d7e6eccc7':
  Store location for SRI panoramas.

11 years agoam 086aa588: am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 20:26:30 +0000 (13:26 -0700)]
am 086aa588: am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce

* commit '086aa5885fc61eecff0345732943ece8c8cde9da':
  Fix local adjust

11 years agoam 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce
Sascha Haeberling [Wed, 24 Apr 2013 20:24:51 +0000 (13:24 -0700)]
am 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce

* commit '2b247c58611779c69aa2f0f243acf0b6d0a65333':
  Store location for SRI panoramas.

11 years agoMerge "Store location for SRI panoramas." into gb-ub-photos-bryce
Sascha Haeberling [Wed, 24 Apr 2013 20:23:19 +0000 (20:23 +0000)]
Merge "Store location for SRI panoramas." into gb-ub-photos-bryce

11 years agoam dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 20:21:43 +0000 (13:21 -0700)]
am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce

* commit 'dc464a129bad2a2918531fc8a4415c41b60605e6':
  Fix local adjust

11 years agoMerge "Fix local adjust" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 20:19:27 +0000 (20:19 +0000)]
Merge "Fix local adjust" into gb-ub-photos-bryce

11 years agoam b7dc30d0: am 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 24 Apr 2013 19:43:34 +0000 (12:43 -0700)]
am b7dc30d0: am 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam 99f6ddff: am a6e5864f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 19:43:33 +0000 (12:43 -0700)]
am 99f6ddff: am a6e5864f: (-s ours) Import translations. DO NOT MERGE

* commit '99f6ddff6dd38e80c5f2ec7dd09b0b7799f59fc9':
  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 agoam 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 24 Apr 2013 19:42:24 +0000 (12:42 -0700)]
am 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '8acf85be0bccc53db78075fb7cf7f85b9706e828':
  Import translations. DO NOT MERGE

11 years agoam a6e5864f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 19:42:24 +0000 (12:42 -0700)]
am a6e5864f: (-s ours) Import translations. DO NOT MERGE

* commit 'a6e5864f592fcca5d0ef907753bf2ffd52cd5d48':
  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 agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 24 Apr 2013 19:41:08 +0000 (19:41 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoStore location for SRI panoramas.
Sascha Haeberling [Wed, 24 Apr 2013 17:58:58 +0000 (10:58 -0700)]
Store location for SRI panoramas.

  Bug: 8692005

Change-Id: I1499de0103e518ee321ebb0c566b9fb4a7a853d3

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:52:45 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8cd5a603a76b616df7a2bc1cb8b8ae0db4f2d5ee
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 agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 17:50:35 +0000 (10:50 -0700)]
Import translations. DO NOT MERGE

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

11 years agoFix local adjust
John Hoford [Sat, 20 Apr 2013 15:12:48 +0000 (08:12 -0700)]
Fix local adjust

bug:8655977
Change-Id: I0aa4ac30de077663f52418528757a842372e0fc2

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 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 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 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 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: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: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

11 years agoam 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce
Michael Kolb [Mon, 22 Apr 2013 17:33:06 +0000 (10:33 -0700)]
am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce

* commit '608f7c9843f48aeccc1678622dc3327958150c31':
  More menu fixes

11 years agoMerge "More menu fixes" into gb-ub-photos-bryce
Michael Kolb [Mon, 22 Apr 2013 17:31:50 +0000 (17:31 +0000)]
Merge "More menu fixes" into gb-ub-photos-bryce

11 years agoMore menu fixes
Michael Kolb [Fri, 19 Apr 2013 23:21:24 +0000 (16:21 -0700)]
More menu fixes

  Bug: 8660834

Add label dropshadow, reposition fixed menu
Adjust dead zone and angle

Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7

11 years agoam d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
Doris Liu [Mon, 22 Apr 2013 17:16:54 +0000 (10:16 -0700)]
am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce

* commit 'd6e6533a054ea526021c3331a18f93a618442f13':
  Fix for camera switcher hard to hit

11 years agoam ed689873: Merge "Fix camera buttons showing up at wrong position" into gb-ub-photo...
Doris Liu [Mon, 22 Apr 2013 17:13:45 +0000 (10:13 -0700)]
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

11 years agoam ca6f04e2: Remove dead code
Bobby Georgescu [Mon, 22 Apr 2013 17:13:44 +0000 (10:13 -0700)]
am ca6f04e2: Remove dead code

* commit 'ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac':
  Remove dead code

11 years agoMerge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
Doris Liu [Mon, 22 Apr 2013 17:13:22 +0000 (17:13 +0000)]
Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce

11 years agoMerge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
Doris Liu [Mon, 22 Apr 2013 17:13:05 +0000 (17:13 +0000)]
Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce

11 years agoFix for camera switcher hard to hit
Doris Liu [Sat, 20 Apr 2013 21:12:53 +0000 (14:12 -0700)]
Fix for camera switcher hard to hit

Bug: 8667079
Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707

11 years agoReenables crop aspect ratio menu.
Ruben Brunk [Sat, 20 Apr 2013 00:00:51 +0000 (17:00 -0700)]
Reenables crop aspect ratio menu.

Bug: 8471812

Change-Id: I50044f4c787ba326e24f67c5370e1f8a220eb005

11 years agoFix camera buttons showing up at wrong position
Doris Liu [Sat, 20 Apr 2013 18:30:35 +0000 (11:30 -0700)]
Fix camera buttons showing up at wrong position

Bug: 8607034
Change-Id: Ia796a9f5e56fd0566e2f4853ec48b9371e8134e2

11 years agoRemove dead code
Bobby Georgescu [Sat, 20 Apr 2013 17:26:15 +0000 (10:26 -0700)]
Remove dead code

Bug: 8672542
Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e

11 years agoam d97733b2: Strings update
nicolasroard [Sat, 20 Apr 2013 05:29:49 +0000 (22:29 -0700)]
am d97733b2: Strings update

* commit 'd97733b2d3cd1fe7398bb399a1fbd227ef0ba746':
  Strings update

11 years agoam bb894c4f: Merge "String updates." into gb-ub-photos-bryce
Nicolas Roard [Sat, 20 Apr 2013 05:29:48 +0000 (22:29 -0700)]
am bb894c4f: Merge "String updates." into gb-ub-photos-bryce

* commit 'bb894c4f321b27ede8e97c42117973376bbaf32f':
  String updates.

11 years agoam 237216ee: Rename scenemode AUTO to NONE
Michael Kolb [Sat, 20 Apr 2013 05:29:47 +0000 (22:29 -0700)]
am 237216ee: Rename scenemode AUTO to NONE

* commit '237216eeba5c05d63aa075ac8dc4af423044f302':
  Rename scenemode AUTO to NONE

11 years agoam f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos...
Ruben Brunk [Sat, 20 Apr 2013 05:29:47 +0000 (22:29 -0700)]
am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce

* commit 'f53eea80c773a1686631f9e2ec6edab23c8944b5':
  Ensure consistent image thumbnail handling.

11 years agoam afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce
Ruben Brunk [Sat, 20 Apr 2013 05:29:46 +0000 (22:29 -0700)]
am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce

* commit 'afc46d5a608ccfc1f370cc705e0c27eb0b678ded':
  Fix saved video timestamps.

11 years agoMerge commit '91d26f6c' into jb-mr2-dev
Chad Jones [Sat, 20 Apr 2013 04:17:52 +0000 (21:17 -0700)]
Merge commit '91d26f6c' into jb-mr2-dev