OSDN Git Service

android-x86/packages-apps-Gallery2.git
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 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 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 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 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" 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 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: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

11 years agosmall ui changes based on UX/PM feedback
John Hoford [Mon, 29 Apr 2013 14:30:33 +0000 (07:30 -0700)]
small ui changes based on UX/PM feedback

bug:8664728
Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043

11 years agoam 61e5715d: am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
Ruben Brunk [Mon, 29 Apr 2013 18:56:25 +0000 (11:56 -0700)]
am 61e5715d: am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce

* commit '61e5715d3645b5af300b475db081798ec481042b':
  Cleanup crop activity UI.

11 years agoam 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
Ruben Brunk [Mon, 29 Apr 2013 18:54:55 +0000 (11:54 -0700)]
am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce

* commit '9e5b079934538f2c90d0ac995330fb006b738cc7':
  Cleanup crop activity UI.

11 years agoMerge "Cleanup crop activity UI." into gb-ub-photos-bryce
Ruben Brunk [Mon, 29 Apr 2013 18:54:12 +0000 (18:54 +0000)]
Merge "Cleanup crop activity UI." into gb-ub-photos-bryce

11 years agoam 657384bb: am 384971f7: Instrument importer for usage statistics
Bobby Georgescu [Mon, 29 Apr 2013 18:05:02 +0000 (11:05 -0700)]
am 657384bb: am 384971f7: Instrument importer for usage statistics

* commit '657384bb34fb2fc7af5480134c1619bb3358f119':
  Instrument importer for usage statistics

11 years agoam 384971f7: Instrument importer for usage statistics
Bobby Georgescu [Mon, 29 Apr 2013 18:03:43 +0000 (11:03 -0700)]
am 384971f7: Instrument importer for usage statistics

* commit '384971f7ce93c98249825d0498ad4bcbd4104895':
  Instrument importer for usage statistics

11 years agoInstrument importer for usage statistics
Bobby Georgescu [Sun, 28 Apr 2013 19:44:55 +0000 (12:44 -0700)]
Instrument importer for usage statistics

Bug: 8744068
Change-Id: I416463ba15713d363ac0ce68109532b770fb02b3

11 years agoam dacb9142: am a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb...
Angus Kong [Fri, 26 Apr 2013 23:33:42 +0000 (16:33 -0700)]
am dacb9142: am a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce

* commit 'dacb9142e19c5f38103091d0a486c24eda640451':
  Delegate the texture copy to DrawClient.

11 years agoam a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
Angus Kong [Fri, 26 Apr 2013 23:32:45 +0000 (16:32 -0700)]
am a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce

* commit 'a042bfaa31e514ea0979936d39cde8696fc0ece0':
  Delegate the texture copy to DrawClient.

11 years agoMerge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
Angus Kong [Fri, 26 Apr 2013 23:30:49 +0000 (23:30 +0000)]
Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce

11 years agoam 7df6a438: am 45377ce9: Merge "Log name of borders and filters of saved images...
Bobby Georgescu [Fri, 26 Apr 2013 23:22:08 +0000 (16:22 -0700)]
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

11 years agoam 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photo...
Bobby Georgescu [Fri, 26 Apr 2013 23:20:39 +0000 (16:20 -0700)]
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

11 years agoMerge "Log name of borders and filters of saved images" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 26 Apr 2013 23:19:36 +0000 (23:19 +0000)]
Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce

11 years agoam 68e04f4c: am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 23:02:52 +0000 (16:02 -0700)]
am 68e04f4c: am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce

* commit '68e04f4c344f838daaa980f3ff44d304f5de0090':
  Add new indicators

11 years agoam 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 23:01:29 +0000 (16:01 -0700)]
am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce

* commit '8021e39d649be4603e66d5f82cef607ada87d56b':
  Add new indicators

11 years agoMerge "Add new indicators" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 23:00:13 +0000 (23:00 +0000)]
Merge "Add new indicators" into gb-ub-photos-bryce

11 years agoAdd new indicators
Michael Kolb [Fri, 26 Apr 2013 18:09:29 +0000 (11:09 -0700)]
Add new indicators

  Bug: 8640131

Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456

11 years agoam 42a5183f: am 568a8cf9: Dismiss MTP notification on device disconnect
Bobby Georgescu [Fri, 26 Apr 2013 22:35:53 +0000 (15:35 -0700)]
am 42a5183f: am 568a8cf9: Dismiss MTP notification on device disconnect

* commit '42a5183f2308b8c2cf9b58b921879aefaca7d6a9':
  Dismiss MTP notification on device disconnect

11 years agoam 568a8cf9: Dismiss MTP notification on device disconnect
Bobby Georgescu [Fri, 26 Apr 2013 22:33:21 +0000 (15:33 -0700)]
am 568a8cf9: Dismiss MTP notification on device disconnect

* commit '568a8cf9ec253a635a36866efc0e3acebbba2a2e':
  Dismiss MTP notification on device disconnect

11 years agoLog name of borders and filters of saved images
Bobby Georgescu [Fri, 26 Apr 2013 22:27:14 +0000 (15:27 -0700)]
Log name of borders and filters of saved images

Bug: 8712946
Change-Id: Id7b32ceb00b131299c6d8630bca181141dc204fd

11 years agoDismiss MTP notification on device disconnect
Bobby Georgescu [Fri, 26 Apr 2013 22:07:01 +0000 (15:07 -0700)]
Dismiss MTP notification on device disconnect

Bug: 8158516
Change-Id: I7d7fd78b5fb9dc199e9ecdd78440e0f8147fe58d

11 years agoam 6d742d71: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 26 Apr 2013 22:06:38 +0000 (15:06 -0700)]
am 6d742d71: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

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

11 years agoam 272e9e02: am 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Fri, 26 Apr 2013 22:03:17 +0000 (15:03 -0700)]
am 272e9e02: am 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '272e9e023f0e1492b8a3cc66b6de493f859fccd1':
  Import translations. DO NOT MERGE

11 years agoDelegate the texture copy to DrawClient.
Angus Kong [Fri, 26 Apr 2013 18:17:58 +0000 (11:17 -0700)]
Delegate the texture copy to DrawClient.

bug:8109314
Change-Id: Ib70b9d4fa4edbf094bc0d4644b3994a5e8303013

11 years agoam 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 26 Apr 2013 22:00:01 +0000 (15:00 -0700)]
am 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '4060811aa01c7fc4ed98aa3f1c98b8948fd0a395':
  Import translations. DO NOT MERGE

11 years agoam 577c826a: am 9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Fri, 26 Apr 2013 22:00:01 +0000 (15:00 -0700)]
am 577c826a: am 9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '577c826a5bd88e64784f0290a49a0ae67f662bbc':
  Import translations. DO NOT MERGE

11 years agoam 9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 26 Apr 2013 21:56:55 +0000 (14:56 -0700)]
am 9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam 5e0b6b4e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 26 Apr 2013 21:56:46 +0000 (14:56 -0700)]
am 5e0b6b4e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '5e0b6b4ef38f180e9a8b194321ee2c9ae2acd6f7':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 26 Apr 2013 21:56:28 +0000 (21:56 +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 [Fri, 26 Apr 2013 21:55:37 +0000 (21:55 +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 [Fri, 26 Apr 2013 21:55:17 +0000 (21:55 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoCleanup crop activity UI.
Ruben Brunk [Thu, 25 Apr 2013 23:31:57 +0000 (16:31 -0700)]
Cleanup crop activity UI.

Bug: 8734193
Bug: 8723843

Change-Id: I09f0e8fcb0d919c573ad9a6f7b9f060f667d1d0d

11 years agoam 16d5904e: am ec6d1d85: Merge "Show notification to relaunch MTP importer" into...
Bobby Georgescu [Fri, 26 Apr 2013 19:05:38 +0000 (12:05 -0700)]
am 16d5904e: am ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce

* commit '16d5904ed1774f95429aceca14adb293e1d51e2b':
  Show notification to relaunch MTP importer

11 years agoam ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos...
Bobby Georgescu [Fri, 26 Apr 2013 18:52:23 +0000 (11:52 -0700)]
am ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce

* commit 'ec6d1d852e7970da5c64dd9e37f58f741b713fa2':
  Show notification to relaunch MTP importer

11 years agoMerge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 26 Apr 2013 18:50:43 +0000 (18:50 +0000)]
Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce

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

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

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

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

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

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

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

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

11 years agoam 539b6435: am d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 18:12:49 +0000 (11:12 -0700)]
am 539b6435: am d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce

* commit '539b6435ab202d2109af915fa92b5ec928f64c97':
  Center Video menu

11 years agoam ab371536: am 132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos...
Michael Kolb [Fri, 26 Apr 2013 18:12:48 +0000 (11:12 -0700)]
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

11 years agoam d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 18:11:14 +0000 (11:11 -0700)]
am d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce

* commit 'd04ba19a49bc26e34c7b5c7832c46058100e986d':
  Center Video menu

11 years agoam 132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 18:11:13 +0000 (11:11 -0700)]
am 132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos-bryce

* commit '132eb666756115e578dada36624b977ac4d10e38':
  Don't render label on focus ring

11 years agoMerge "Center Video menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 18:10:17 +0000 (18:10 +0000)]
Merge "Center Video menu" into gb-ub-photos-bryce

11 years agoMerge "Don't render label on focus ring" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 18:10:03 +0000 (18:10 +0000)]
Merge "Don't render label on focus ring" into gb-ub-photos-bryce

11 years agoam 327497ef: am 5ed7c697: Merge "Remove new camera activity code from Bryce" into...
Doris Liu [Fri, 26 Apr 2013 17:10:43 +0000 (10:10 -0700)]
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

11 years agoam 5ed7c697: Merge "Remove new camera activity code from Bryce" into gb-ub-photos...
Doris Liu [Fri, 26 Apr 2013 17:07:54 +0000 (10:07 -0700)]
am 5ed7c697: Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce

* commit '5ed7c697ded34de36f81c0fc4b61d6b46d76124a':
  Remove new camera activity code from Bryce

11 years agoMerge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce
Doris Liu [Fri, 26 Apr 2013 17:06:19 +0000 (17:06 +0000)]
Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce

11 years agoam 11858014: am 37177f96: Merge "Make sure the initial rotation is set" into gb-ub...
Doris Liu [Fri, 26 Apr 2013 16:53:33 +0000 (09:53 -0700)]
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

11 years agoam 37177f96: Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce
Doris Liu [Fri, 26 Apr 2013 16:51:47 +0000 (09:51 -0700)]
am 37177f96: Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce

* commit '37177f96a852fd7aa4b8c06d34fd3fb445541994':
  Make sure the initial rotation is set

11 years agoMerge "Make sure the initial rotation is set" into gb-ub-photos-bryce
Doris Liu [Fri, 26 Apr 2013 16:50:54 +0000 (16:50 +0000)]
Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce

11 years agoCenter Video menu
Michael Kolb [Fri, 26 Apr 2013 16:22:52 +0000 (09:22 -0700)]
Center Video menu

  Bug: 8660834

Change-Id: I17bec35506fee5d590436811eb7411f4277b7b6c

11 years agoDon't render label on focus ring
Michael Kolb [Fri, 26 Apr 2013 15:53:49 +0000 (08:53 -0700)]
Don't render label on focus ring

  Bug: 8719036

Change-Id: If783b96aaa8c56fceb98cb52fceb9a8afda0d59a

11 years agoam d888ee54: am eda2f0ce: Merge "Fix offset and ASCII type handling in exif." into...
Ruben Brunk [Fri, 26 Apr 2013 04:22:47 +0000 (21:22 -0700)]
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.