OSDN Git Service

android-x86/packages-apps-Camera2.git
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

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 98c193c8: am dacb9142: am a042bfaa: Merge "Delegate the texture copy to DrawClient...
Angus Kong [Mon, 29 Apr 2013 18:22:22 +0000 (11:22 -0700)]
am 98c193c8: am dacb9142: am a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce

* commit '98c193c8df1fee66bf7f91a12a5bd40f99f0d893':
  Delegate the texture copy to DrawClient.

11 years agoam d2b8538b: am 7df6a438: am 45377ce9: Merge "Log name of borders and filters of...
Bobby Georgescu [Mon, 29 Apr 2013 18:22:21 +0000 (11:22 -0700)]
am d2b8538b: am 7df6a438: am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce

* commit 'd2b8538ba45564049a32b9571f76f702c83d1651':
  Log name of borders and filters of saved images

11 years agoam b6a4a52c: am 68e04f4c: am 8021e39d: Merge "Add new indicators" into gb-ub-photos...
Michael Kolb [Mon, 29 Apr 2013 18:22:18 +0000 (11:22 -0700)]
am b6a4a52c: am 68e04f4c: am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce

* commit 'b6a4a52ca139a82d2231319c1423725cc0fc9369':
  Add new indicators

11 years agoam 4f852565: am 42a5183f: am 568a8cf9: Dismiss MTP notification on device disconnect
Bobby Georgescu [Mon, 29 Apr 2013 18:22:11 +0000 (11:22 -0700)]
am 4f852565: am 42a5183f: am 568a8cf9: Dismiss MTP notification on device disconnect

* commit '4f8525654b6595569a533724c7427a4cf0566ffb':
  Dismiss MTP notification on device disconnect

11 years agoam 7c908a01: am 6d742d71: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 29 Apr 2013 18:22:01 +0000 (11:22 -0700)]
am 7c908a01: am 6d742d71: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '7c908a01e9f19e47491bb7a8f1983492263b4212':
  Import translations. DO NOT MERGE

11 years agoam 66a557f3: am 272e9e02: am 4060811a: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 29 Apr 2013 18:22:00 +0000 (11:22 -0700)]
am 66a557f3: am 272e9e02: am 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '66a557f302bacad61bbec716e2445546841f18b4':
  Import translations. DO NOT MERGE

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

* commit '7ff805ac933c074e148fb107c7aa548cce1e39d5':
  Import translations. DO NOT MERGE

11 years agoam acc26e20: am 5e0b6b4e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 29 Apr 2013 18:21:59 +0000 (11:21 -0700)]
am acc26e20: am 5e0b6b4e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

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