OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 3 May 2013 20:37:39 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam b6238e9a: am 49101abc: am 6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb...
George Mount [Thu, 2 May 2013 17:27:20 +0000 (10:27 -0700)]
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.

11 years agoam 49101abc: am 6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
George Mount [Thu, 2 May 2013 17:22:41 +0000 (10:22 -0700)]
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.

11 years agoam 6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
George Mount [Thu, 2 May 2013 17:20:56 +0000 (10:20 -0700)]
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.

11 years agoMerge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
George Mount [Thu, 2 May 2013 17:19:24 +0000 (17:19 +0000)]
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.

11 years agoClass to simplify use of GalleryBitmapPool for decoding Bitmaps.
George Mount [Tue, 30 Apr 2013 18:53:46 +0000 (11:53 -0700)]
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.

 Bug 8446191
 Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63

Change-Id: Ia9b2ced0bfd9c9c1b969c77bc89eaa0fa87687bb

11 years agoAllow prefetch for cache, reducing priority for prefetched images.
George Mount [Wed, 1 May 2013 23:56:32 +0000 (16:56 -0700)]
Allow prefetch for cache, reducing priority for prefetched images.

 Bug 8446191
 Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63

Change-Id: I7cccfffc539988d26fc751e16726b05fb2ba21bd

11 years agoam c8a90b2b: am 6ef06ee3: am f469a168: Fix flashing (remove clipping)
nicolasroard [Thu, 2 May 2013 06:40:12 +0000 (23:40 -0700)]
am c8a90b2b: am 6ef06ee3: am f469a168: Fix flashing (remove clipping)

* commit 'c8a90b2ba70aad02e6d07b1698e6f4f03590ca47':
  Fix flashing (remove clipping)

11 years agoam 6ef06ee3: am f469a168: Fix flashing (remove clipping)
nicolasroard [Thu, 2 May 2013 06:38:26 +0000 (23:38 -0700)]
am 6ef06ee3: am f469a168: Fix flashing (remove clipping)

* commit '6ef06ee314910347baed13fad487ad2a24f50c54':
  Fix flashing (remove clipping)

11 years agoam f469a168: Fix flashing (remove clipping)
nicolasroard [Thu, 2 May 2013 06:36:50 +0000 (23:36 -0700)]
am f469a168: Fix flashing (remove clipping)

* commit 'f469a1689a9563f3c5bb68f46a5d9cd152d67053':
  Fix flashing (remove clipping)

11 years agoFix flashing (remove clipping)
nicolasroard [Thu, 2 May 2013 03:48:56 +0000 (20:48 -0700)]
Fix flashing (remove clipping)

bug:8747333

Change-Id: Ie1e7f1a58bf195b1f427b75ee9a1390e29b3ba2a

11 years agoam 5840c68e: am 8275c99e: am 00259461: Fix UI
nicolasroard [Thu, 2 May 2013 03:32:23 +0000 (20:32 -0700)]
am 5840c68e: am 8275c99e: am 00259461: Fix UI

* commit '5840c68e43b49865c2d0ca857e655374971cf9ca':
  Fix UI

11 years agoam 8275c99e: am 00259461: Fix UI
nicolasroard [Thu, 2 May 2013 03:30:41 +0000 (20:30 -0700)]
am 8275c99e: am 00259461: Fix UI

* commit '8275c99e304645c72ef5856ed4142468bca5cd03':
  Fix UI

11 years agoam 00259461: Fix UI
nicolasroard [Thu, 2 May 2013 03:29:11 +0000 (20:29 -0700)]
am 00259461: Fix UI

* commit '00259461be82e601b58d3e970afbf0c012c5f3e7':
  Fix UI

11 years agoFix UI
nicolasroard [Wed, 1 May 2013 03:50:03 +0000 (20:50 -0700)]
Fix UI

bug:8664728
Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4

11 years agoam b4bf4692: am 9774a161: am 5a352be0: Increase selection limit
Bobby Georgescu [Thu, 2 May 2013 00:53:51 +0000 (17:53 -0700)]
am b4bf4692: am 9774a161: am 5a352be0: Increase selection limit

* commit 'b4bf4692325eb6dc7346d07f57da318c881ce294':
  Increase selection limit

11 years agoam 9774a161: am 5a352be0: Increase selection limit
Bobby Georgescu [Thu, 2 May 2013 00:51:10 +0000 (17:51 -0700)]
am 9774a161: am 5a352be0: Increase selection limit

* commit '9774a161aa1547ee92acff609189adca683cbce0':
  Increase selection limit

11 years agoam 5a352be0: Increase selection limit
Bobby Georgescu [Thu, 2 May 2013 00:49:46 +0000 (17:49 -0700)]
am 5a352be0: Increase selection limit

* commit '5a352be0df79b03c942eb67a799ddb3aaa1a26a2':
  Increase selection limit

11 years agoIncrease selection limit
Bobby Georgescu [Thu, 2 May 2013 00:27:19 +0000 (17:27 -0700)]
Increase selection limit

Bug: 8606565
Bug: 8721237
Bug: 8752803
Change-Id: I578536389146fb4d8735c8171ec346ebe49de729

11 years agoam aec918b9: am ec7fc927: am fb936141: Merge "Fix layout and preview for tablets...
Michael Kolb [Wed, 1 May 2013 21:53:34 +0000 (14:53 -0700)]
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

11 years agoam ec7fc927: am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photo...
Michael Kolb [Wed, 1 May 2013 21:52:25 +0000 (14:52 -0700)]
am ec7fc927: am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce

* commit 'ec7fc9277418d823c32c078c2c5589edbea3ad4b':
  Fix layout and preview for tablets

11 years agoam fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
Michael Kolb [Wed, 1 May 2013 21:50:04 +0000 (14:50 -0700)]
am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce

* commit 'fb9361419abfac7f893674bb6f4d1b1f8ab1f677':
  Fix layout and preview for tablets

11 years agoMerge "Fix layout and preview for tablets" into gb-ub-photos-bryce
Michael Kolb [Wed, 1 May 2013 21:48:29 +0000 (21:48 +0000)]
Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce

11 years agoFix layout and preview for tablets
Michael Kolb [Wed, 1 May 2013 20:28:24 +0000 (13:28 -0700)]
Fix layout and preview for tablets

  Bug: 8253060

Make controls full screen, and layout according to required size

Change-Id: I725547041264457d85d73d470d25caa5cb2cf783

11 years agoam f1ba6eb9: (-s ours) am 36648e50: am 32aa7da8: (-s ours) Merge "Import translations...
Baligh Uddin [Wed, 1 May 2013 20:57:59 +0000 (13:57 -0700)]
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

11 years agoam 36648e50: am 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 1 May 2013 20:55:37 +0000 (13:55 -0700)]
am 36648e50: am 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '36648e508e8241757a1798e79d18d5a9abeccc45':
  Import translations. DO NOT MERGE

11 years agoam 2a02906f: (-s ours) am 287a40d1: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 1 May 2013 20:54:28 +0000 (13:54 -0700)]
am 2a02906f: (-s ours) am 287a40d1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam 287a40d1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 1 May 2013 20:52:07 +0000 (13:52 -0700)]
am 287a40d1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '287a40d1aba640d8bd6f82631d577524e544d071':
  Import translations. DO NOT MERGE

11 years agoam 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 1 May 2013 20:50:42 +0000 (13:50 -0700)]
am 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '32aa7da8dc533a5add4ca7c94a69201ff5ed9a90':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 1 May 2013 20:49:11 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 1 May 2013 20:48:58 +0000 (20:48 +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, 1 May 2013 20:48:43 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 9bd6b55d: am 746a8792: am c43e5b6b: Update capture animation
Michael Kolb [Wed, 1 May 2013 20:27:23 +0000 (13:27 -0700)]
am 9bd6b55d: am 746a8792: am c43e5b6b: Update capture animation

* commit '9bd6b55d1fd682c247b15408dd28db0042332826':
  Update capture animation

11 years agoam 125909fd: am 8cc69e74: am 03e752e0: Update scene mode off icon in menu
Michael Kolb [Wed, 1 May 2013 20:27:22 +0000 (13:27 -0700)]
am 125909fd: am 8cc69e74: am 03e752e0: Update scene mode off icon in menu

* commit '125909fdb1e78c1632d1079fd161ceddd745d7dd':
  Update scene mode off icon in menu

11 years agoam 746a8792: am c43e5b6b: Update capture animation
Michael Kolb [Wed, 1 May 2013 20:25:09 +0000 (13:25 -0700)]
am 746a8792: am c43e5b6b: Update capture animation

* commit '746a87929bd3b14c2d467b279659990bf3188c7e':
  Update capture animation

11 years agoam 8cc69e74: am 03e752e0: Update scene mode off icon in menu
Michael Kolb [Wed, 1 May 2013 20:25:09 +0000 (13:25 -0700)]
am 8cc69e74: am 03e752e0: Update scene mode off icon in menu

* commit '8cc69e74a008dfad4fb9d34dd5692575954a7080':
  Update scene mode off icon in menu

11 years agoam c43e5b6b: Update capture animation
Michael Kolb [Wed, 1 May 2013 20:22:29 +0000 (13:22 -0700)]
am c43e5b6b: Update capture animation

* commit 'c43e5b6bd84f5a7635766f70677097f6958f4058':
  Update capture animation

11 years agoam 03e752e0: Update scene mode off icon in menu
Michael Kolb [Wed, 1 May 2013 20:22:27 +0000 (13:22 -0700)]
am 03e752e0: Update scene mode off icon in menu

* commit '03e752e0c9f9978663fb5bca06edd5e56476132e':
  Update scene mode off icon in menu

11 years agoUpdate capture animation
Michael Kolb [Tue, 30 Apr 2013 22:34:19 +0000 (15:34 -0700)]
Update capture animation

  Bug: 8253060

Update preview thumb margins and size
Add touch target for thumbnail

Change-Id: I2b298de330834c42a55b4cb082148d971727f530

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 18:12:00 +0000 (11:12 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 18:11:24 +0000 (11:11 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 18:10:48 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE

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

11 years agoUpdate scene mode off icon in menu
Michael Kolb [Wed, 1 May 2013 18:04:15 +0000 (11:04 -0700)]
Update scene mode off icon in menu

  Bug: 8656593

Change-Id: Ic310bd896a02ae842c5a5af180dfcec289c679fc

11 years agoam 3b7a6553: am eedc9eeb: am 9ea4147f: Update location indicator correctly
Michael Kolb [Wed, 1 May 2013 00:14:12 +0000 (17:14 -0700)]
am 3b7a6553: am eedc9eeb: am 9ea4147f: Update location indicator correctly

* commit '3b7a6553acaba85b1282789578de547d69a39c49':
  Update location indicator correctly

11 years agoam 552ffa38: am 51b8ce8e: am 64c9c183: Adjust switcher animation
Michael Kolb [Wed, 1 May 2013 00:14:11 +0000 (17:14 -0700)]
am 552ffa38: am 51b8ce8e: am 64c9c183: Adjust switcher animation

* commit '552ffa38866e1bd6c35e461791c895f629d6d2f4':
  Adjust switcher animation

11 years agoam eedc9eeb: am 9ea4147f: Update location indicator correctly
Michael Kolb [Wed, 1 May 2013 00:05:02 +0000 (17:05 -0700)]
am eedc9eeb: am 9ea4147f: Update location indicator correctly

* commit 'eedc9eeb82f41f3d266019c38b4cabc4368c486f':
  Update location indicator correctly

11 years agoam 51b8ce8e: am 64c9c183: Adjust switcher animation
Michael Kolb [Tue, 30 Apr 2013 23:59:06 +0000 (16:59 -0700)]
am 51b8ce8e: am 64c9c183: Adjust switcher animation

* commit '51b8ce8ed24ebe9d05fd192e0fce9d495b8eb5a6':
  Adjust switcher animation

11 years agoam 2b3b02c1: am c8a2d34c: am b048226f: Merge "Align review controls" into gb-ub-photo...
Michael Kolb [Tue, 30 Apr 2013 23:45:29 +0000 (16:45 -0700)]
am 2b3b02c1: am c8a2d34c: am b048226f: Merge "Align review controls" into gb-ub-photos-bryce

* commit '2b3b02c14114ed70e66800a0575d4d11a5ad0107':
  Align review controls

11 years agoam e74fa383: am a9c070ad: am fe804d11: Handle onDowngrade in PhotoDatabase
Mangesh Ghiware [Tue, 30 Apr 2013 23:45:28 +0000 (16:45 -0700)]
am e74fa383: am a9c070ad: am fe804d11: Handle onDowngrade in PhotoDatabase

* commit 'e74fa38341cbb69d8a089f5a27da0d15b67a16bb':
  Handle onDowngrade in PhotoDatabase

11 years agoam e54e43e2: am 75a1975a: am ce8f6d1b: Remove empty slots from menu
Michael Kolb [Tue, 30 Apr 2013 23:45:28 +0000 (16:45 -0700)]
am e54e43e2: am 75a1975a: am ce8f6d1b: Remove empty slots from menu

* commit 'e54e43e24218a02e4d820e85b2e6462cb01cbee7':
  Remove empty slots from menu

11 years agoam a09ae5d4: (-s ours) am d651db7a: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 30 Apr 2013 23:45:27 +0000 (16:45 -0700)]
am a09ae5d4: (-s ours) am d651db7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam 58c076d9: (-s ours) am 4d8a127e: am aa3541c5: (-s ours) Merge "Import translations...
Baligh Uddin [Tue, 30 Apr 2013 23:45:27 +0000 (16:45 -0700)]
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

11 years agoam ef42883d: (-s ours) am ebfadc7f: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 30 Apr 2013 23:45:26 +0000 (16:45 -0700)]
am ef42883d: (-s ours) am ebfadc7f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam ac7de390: (-s ours) am 055893a4: am 9ce3bef0: (-s ours) Import translations. DO...
Baligh Uddin [Tue, 30 Apr 2013 23:45:25 +0000 (16:45 -0700)]
am ac7de390: (-s ours) am 055893a4: am 9ce3bef0: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam b61555d0: am 096b9781: am 9c525edf: Merge "Remove timer indicator" into gb-ub...
Michael Kolb [Tue, 30 Apr 2013 23:45:25 +0000 (16:45 -0700)]
am b61555d0: am 096b9781: am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce

* commit 'b61555d0d9cf2b7f1f252582a466a6c0b36d3419':
  Remove timer indicator

11 years agoam e8cce4df: am c5e43f82: am d6edcee3: Merge "small ui changes based on UX/PM feedbac...
John Hoford [Tue, 30 Apr 2013 23:45:24 +0000 (16:45 -0700)]
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

11 years agoam c8a2d34c: am b048226f: Merge "Align review controls" into gb-ub-photos-bryce
Michael Kolb [Tue, 30 Apr 2013 23:43:18 +0000 (16:43 -0700)]
am c8a2d34c: am b048226f: Merge "Align review controls" into gb-ub-photos-bryce

* commit 'c8a2d34c2efec8e9c97c9c88658cc67b90d9db3a':
  Align review controls

11 years agoam a9c070ad: am fe804d11: Handle onDowngrade in PhotoDatabase
Mangesh Ghiware [Tue, 30 Apr 2013 23:43:15 +0000 (16:43 -0700)]
am a9c070ad: am fe804d11: Handle onDowngrade in PhotoDatabase

* commit 'a9c070adf31d9e4da5bf5f6fdde30701c1d525cd':
  Handle onDowngrade in PhotoDatabase

11 years agoam 75a1975a: am ce8f6d1b: Remove empty slots from menu
Michael Kolb [Tue, 30 Apr 2013 23:43:01 +0000 (16:43 -0700)]
am 75a1975a: am ce8f6d1b: Remove empty slots from menu

* commit '75a1975abec4bfed44906605fd045b3c06a10bfa':
  Remove empty slots from menu

11 years agoam d651db7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Tue, 30 Apr 2013 23:42:42 +0000 (16:42 -0700)]
am d651db7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam 4d8a127e: am aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 30 Apr 2013 23:42:41 +0000 (16:42 -0700)]
am 4d8a127e: am aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '4d8a127e3e45639dd7ef3f4e717da43ddac847af':
  Import translations. DO NOT MERGE

11 years agoam ebfadc7f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Tue, 30 Apr 2013 23:42:41 +0000 (16:42 -0700)]
am ebfadc7f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam 055893a4: am 9ce3bef0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Apr 2013 23:42:40 +0000 (16:42 -0700)]
am 055893a4: am 9ce3bef0: (-s ours) Import translations. DO NOT MERGE

* commit '055893a45bc66c626585360389ef99af7e3bb8d4':
  Import translations. DO NOT MERGE

11 years agoam 096b9781: am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce
Michael Kolb [Tue, 30 Apr 2013 23:42:29 +0000 (16:42 -0700)]
am 096b9781: am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce

* commit '096b9781f00a6f6a33e82682274c614cee4fed57':
  Remove timer indicator

11 years agoam c5e43f82: am d6edcee3: Merge "small ui changes based on UX/PM feedback" into gb...
John Hoford [Tue, 30 Apr 2013 23:42:29 +0000 (16:42 -0700)]
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

11 years agoam 9ea4147f: Update location indicator correctly
Michael Kolb [Tue, 30 Apr 2013 22:57:05 +0000 (15:57 -0700)]
am 9ea4147f: Update location indicator correctly

* commit '9ea4147f6220e3a9fb6f9ae3fef46036919641b4':
  Update location indicator correctly

11 years agoUpdate location indicator correctly
Michael Kolb [Tue, 30 Apr 2013 22:38:49 +0000 (15:38 -0700)]
Update location indicator correctly

  Bug: 8768592

Change-Id: I8f94b4fb62174c4c27e6dbdc68ba272b0d3ae371

11 years agoam 64c9c183: Adjust switcher animation
Michael Kolb [Tue, 30 Apr 2013 21:32:51 +0000 (14:32 -0700)]
am 64c9c183: Adjust switcher animation

* commit '64c9c183384b9df6dafe0142f10c4f7b802d54bf':
  Adjust switcher animation

11 years agoAdjust switcher animation
Michael Kolb [Tue, 30 Apr 2013 18:49:11 +0000 (11:49 -0700)]
Adjust switcher animation

  Bug: 8754841

Change-Id: I7a25527297eddd11f9c9a025986ff857f97c07be

11 years agoam b048226f: Merge "Align review controls" into gb-ub-photos-bryce
Michael Kolb [Tue, 30 Apr 2013 20:59:42 +0000 (13:59 -0700)]
am b048226f: Merge "Align review controls" into gb-ub-photos-bryce

* commit 'b048226feed739f122ffb39fca51fedaec791e67':
  Align review controls

11 years agoMerge "Align review controls" into gb-ub-photos-bryce
Michael Kolb [Tue, 30 Apr 2013 20:58:33 +0000 (20:58 +0000)]
Merge "Align review controls" into gb-ub-photos-bryce

11 years agoAlign review controls
Michael Kolb [Tue, 30 Apr 2013 20:46:17 +0000 (13:46 -0700)]
Align review controls

  Bug: 8753607

Change-Id: Iea2cef5bf56c82c2ddbd7191be6345a58fa126c9

11 years agoam fe804d11: Handle onDowngrade in PhotoDatabase
Mangesh Ghiware [Tue, 30 Apr 2013 20:41:31 +0000 (13:41 -0700)]
am fe804d11: Handle onDowngrade in PhotoDatabase

* commit 'fe804d11f398b3c03b4a6ccffcfdac56e1728de4':
  Handle onDowngrade in PhotoDatabase

11 years agoHandle onDowngrade in PhotoDatabase
Mangesh Ghiware [Tue, 30 Apr 2013 16:35:31 +0000 (09:35 -0700)]
Handle onDowngrade in PhotoDatabase

Bug: 8683352
Change-Id: Iefaa425a753c8242dc345efd96354bbb7b5bb999

11 years agoam ce8f6d1b: Remove empty slots from menu
Michael Kolb [Tue, 30 Apr 2013 18:50:15 +0000 (11:50 -0700)]
am ce8f6d1b: Remove empty slots from menu

* commit 'ce8f6d1bb9dc52da7d168a94cb4c6f24d631d304':
  Remove empty slots from menu

11 years agoRemove empty slots from menu
Michael Kolb [Tue, 30 Apr 2013 16:23:23 +0000 (09:23 -0700)]
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

11 years agoam cf615402: am 5371a9c2: am ef878669: Fix indicator layout
Michael Kolb [Tue, 30 Apr 2013 15:54:24 +0000 (08:54 -0700)]
am cf615402: am 5371a9c2: am ef878669: Fix indicator layout

* commit 'cf6154020655b42d8785fda4046b8995a77431c0':
  Fix indicator layout

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 30 Apr 2013 15:47:05 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Tue, 30 Apr 2013 15:46:54 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoam aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Tue, 30 Apr 2013 15:46:25 +0000 (08:46 -0700)]
am aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 30 Apr 2013 15:45:39 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 30 Apr 2013 15:44:55 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Tue, 30 Apr 2013 15:44:42 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoam 9ce3bef0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Apr 2013 15:43:19 +0000 (08:43 -0700)]
am 9ce3bef0: (-s ours) Import translations. DO NOT MERGE

* commit '9ce3bef0a877c5573256ea8a76642e45dac92cc4':
  Import translations. DO NOT MERGE

11 years agoam 83057500: am 61e5715d: am 9e5b0799: Merge "Cleanup crop activity UI." into gb...
Ruben Brunk [Tue, 30 Apr 2013 15:31:47 +0000 (08:31 -0700)]
am 83057500: am 61e5715d: am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce

* commit '83057500efa6d1fad19cefa73565dfa774fb94e4':
  Cleanup crop activity UI.

11 years agoam 2d806a27: am 657384bb: am 384971f7: Instrument importer for usage statistics
Bobby Georgescu [Tue, 30 Apr 2013 14:13:17 +0000 (07:13 -0700)]
am 2d806a27: am 657384bb: am 384971f7: Instrument importer for usage statistics

* commit '2d806a27036347530a1632ac3232fa246cbd26bc':
  Instrument importer for usage statistics

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Apr 2013 08:11:01 +0000 (01:11 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Apr 2013 08:10:38 +0000 (01:10 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Apr 2013 08:10:14 +0000 (01:10 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Apr 2013 08:08:35 +0000 (01:08 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Apr 2013 08:07:58 +0000 (01:07 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Apr 2013 08:07:20 +0000 (01:07 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce
Michael Kolb [Tue, 30 Apr 2013 05:33:28 +0000 (22:33 -0700)]
am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce

* commit '9c525edf6440b6daf10885f4f7a0da479b7f2707':
  Remove timer indicator

11 years agoam d6edcee3: Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce
John Hoford [Tue, 30 Apr 2013 05:33:27 +0000 (22:33 -0700)]
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

11 years agoMerge "Remove timer indicator" into gb-ub-photos-bryce
Michael Kolb [Tue, 30 Apr 2013 03:27:07 +0000 (03:27 +0000)]
Merge "Remove timer indicator" into gb-ub-photos-bryce

11 years agoMerge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce
John Hoford [Tue, 30 Apr 2013 01:18:07 +0000 (01:18 +0000)]
Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce

11 years agoRemove timer indicator
Michael Kolb [Mon, 29 Apr 2013 23:22:26 +0000 (16:22 -0700)]
Remove timer indicator

  Bug: 8754833

Change-Id: I1750ac4ad7300605c3e65015ac9a94d012d26db2

11 years agoam 5371a9c2: am ef878669: Fix indicator layout
Michael Kolb [Mon, 29 Apr 2013 23:05:26 +0000 (16:05 -0700)]
am 5371a9c2: am ef878669: Fix indicator layout

* commit '5371a9c23af5effa1bce940882d022c0b3db3f7f':
  Fix indicator layout

11 years agoam ef878669: Fix indicator layout
Michael Kolb [Mon, 29 Apr 2013 23:04:25 +0000 (16:04 -0700)]
am ef878669: Fix indicator layout

* commit 'ef87866904722e6d381445a98b61a948e004970e':
  Fix indicator layout

11 years agoFix indicator layout
Michael Kolb [Mon, 29 Apr 2013 21:50:41 +0000 (14:50 -0700)]
Fix indicator layout

  Bug: 8754592

Use the correct anchor for layout

Change-Id: Idc408da48dd3066a8dabdd8f4f2c553b54d0dffd