OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos...
Michael Kolb [Thu, 16 May 2013 21:32:42 +0000 (14:32 -0700)]
am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca':
  Add new overlay icons for sharpen and curves

11 years agoMerge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
Michael Kolb [Thu, 16 May 2013 21:31:31 +0000 (21:31 +0000)]
Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

11 years agoAdd new overlay icons for sharpen and curves
Michael Kolb [Thu, 16 May 2013 21:07:29 +0000 (14:07 -0700)]
Add new overlay icons for sharpen and curves

  Bug: 8791729

Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b

11 years agoam 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 20:58:02 +0000 (13:58 -0700)]
am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '75084da1b34e0ff9f269b5409d206c213532edbc':
  toUpper() some strings

11 years agoMerge "toUpper() some strings" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 20:56:29 +0000 (20:56 +0000)]
Merge "toUpper() some strings" into gb-ub-photos-bryce

11 years agoam 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 20:54:50 +0000 (13:54 -0700)]
am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195':
  Fix reset

11 years agoMerge "Fix reset" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 20:52:31 +0000 (20:52 +0000)]
Merge "Fix reset" into gb-ub-photos-bryce

11 years agotoUpper() some strings
John Reck [Thu, 16 May 2013 20:50:50 +0000 (13:50 -0700)]
toUpper() some strings

 Bug: 8791729

Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb

11 years agoam fef58a0f: change edit icon
John Hoford [Thu, 16 May 2013 20:46:27 +0000 (13:46 -0700)]
am fef58a0f: change edit icon

* commit 'fef58a0fc969cc09b02cb9945da8d553698681e3':
  change edit icon

11 years agochange edit icon
John Hoford [Thu, 16 May 2013 19:55:21 +0000 (12:55 -0700)]
change edit icon

bug:8988179
Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0

11 years agoFix reset
John Reck [Wed, 15 May 2013 21:45:34 +0000 (14:45 -0700)]
Fix reset

 Bug: 8791729

Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec

11 years agoam c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos...
Michael Kolb [Wed, 15 May 2013 18:57:37 +0000 (11:57 -0700)]
am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

* commit 'c2f813a36711742af3b23743ef1849cec13a9a95':
  Grey out undo/redo/reset according to state

11 years agoam 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce
Michael Kolb [Wed, 15 May 2013 18:57:36 +0000 (11:57 -0700)]
am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce

* commit '655e208d5dc1305d9e4eb5301dec0673136151c9':
  Correct label position after rotation

11 years agoMerge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
Michael Kolb [Wed, 15 May 2013 18:55:19 +0000 (18:55 +0000)]
Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

11 years agoMerge "Correct label position after rotation" into gb-ub-photos-bryce
Michael Kolb [Wed, 15 May 2013 18:55:08 +0000 (18:55 +0000)]
Merge "Correct label position after rotation" into gb-ub-photos-bryce

11 years agoam 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
ztenghui [Wed, 15 May 2013 17:37:57 +0000 (10:37 -0700)]
am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

* commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426':
  Fix another annoying warning log spam

11 years agoMerge "Fix another annoying warning log spam" into gb-ub-photos-bryce
ztenghui [Wed, 15 May 2013 17:25:40 +0000 (17:25 +0000)]
Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

11 years agoMerge "Enable virtualization" into jb-mr2-dev
Marco Nelissen [Wed, 15 May 2013 14:56:19 +0000 (14:56 +0000)]
Merge "Enable virtualization" into jb-mr2-dev

11 years agoGrey out undo/redo/reset according to state
Michael Kolb [Tue, 14 May 2013 22:43:28 +0000 (15:43 -0700)]
Grey out undo/redo/reset according to state

  Bug: 8791729

Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827

11 years agoCorrect label position after rotation
Michael Kolb [Tue, 14 May 2013 21:28:14 +0000 (14:28 -0700)]
Correct label position after rotation

  Bug: 8963421

Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3

11 years agoam 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub...
Doris Liu [Tue, 14 May 2013 21:26:46 +0000 (14:26 -0700)]
am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

* commit '26dbb20c15e27d22a14efd0a25ec4e50cf5084cc':
  Pause face detection when review captured images

11 years agoMerge "Pause face detection when review captured images" into gb-ub-photos-bryce
Doris Liu [Tue, 14 May 2013 21:25:22 +0000 (21:25 +0000)]
Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

11 years agoam 33f2a880: Only link librsjni in unbundled branches.
Tim Murray [Tue, 14 May 2013 19:44:55 +0000 (12:44 -0700)]
am 33f2a880: Only link librsjni in unbundled branches.

* commit '33f2a8800ff5228bf81a0fdc75c1289bae9a4d1c':
  Only link librsjni in unbundled branches.

11 years agoPause face detection when review captured images
Doris Liu [Tue, 14 May 2013 18:31:19 +0000 (11:31 -0700)]
Pause face detection when review captured images

Bug: 8799508
Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c

11 years agoOnly link librsjni in unbundled branches.
Tim Murray [Mon, 13 May 2013 22:47:58 +0000 (15:47 -0700)]
Only link librsjni in unbundled branches.

bug 8939828

Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a

11 years agoEnable virtualization
Marco Nelissen [Mon, 13 May 2013 20:36:01 +0000 (13:36 -0700)]
Enable virtualization

When the Intent says to virtualize, and the right virtualizer is
present on the device, enable virtualization.
b/8767565

Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2

11 years agoam 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce
Doris Liu [Mon, 13 May 2013 18:34:47 +0000 (11:34 -0700)]
am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce

* commit '25d69c11831fabf8f4e474aaf17b05dd001979ce':
  New count down beeps.

11 years agoMerge "New count down beeps." into gb-ub-photos-bryce
Doris Liu [Mon, 13 May 2013 18:32:20 +0000 (18:32 +0000)]
Merge "New count down beeps." into gb-ub-photos-bryce

11 years agoFix another annoying warning log spam
ztenghui [Sat, 11 May 2013 00:44:23 +0000 (17:44 -0700)]
Fix another annoying warning log spam

bug:8771541

When we set up the icon rendering, we need to set the geometry, too.

Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92

11 years agoNew count down beeps.
Doris Liu [Mon, 13 May 2013 17:48:54 +0000 (10:48 -0700)]
New count down beeps.

Bug: 8872947
Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a

11 years agoam ac94740c: Remove GL dependency on unused stencil buffers.
George Mount [Fri, 10 May 2013 01:04:58 +0000 (18:04 -0700)]
am ac94740c: Remove GL dependency on unused stencil buffers.

* commit 'ac94740cd673a016542d803c8600633c99b7427e':
  Remove GL dependency on unused stencil buffers.

11 years agoRemove GL dependency on unused stencil buffers.
George Mount [Thu, 9 May 2013 20:30:39 +0000 (13:30 -0700)]
Remove GL dependency on unused stencil buffers.

 Bug 8884435

Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34

11 years agoam 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce
ztenghui [Thu, 9 May 2013 16:19:40 +0000 (09:19 -0700)]
am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce

* commit '9a4fb2dc95722c45e2acb4f4fe380d27830f8d8b':
  Fix the verbose log

11 years agoMerge "Fix the verbose log" into gb-ub-photos-bryce
ztenghui [Thu, 9 May 2013 16:18:09 +0000 (16:18 +0000)]
Merge "Fix the verbose log" into gb-ub-photos-bryce

11 years agoam b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce
Bart Sears [Thu, 9 May 2013 06:13:47 +0000 (23:13 -0700)]
am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce

* commit 'b298ab636fec3894b9e702eaa0a6028ba03f49b1':
  Close menu in onPause

11 years agoMerge "Close menu in onPause" into gb-ub-photos-bryce
Bart Sears [Thu, 9 May 2013 06:12:06 +0000 (06:12 +0000)]
Merge "Close menu in onPause" into gb-ub-photos-bryce

11 years agoam e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
Michael Kolb [Thu, 9 May 2013 00:00:00 +0000 (17:00 -0700)]
am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce

* commit 'e324a388ead1f291fe27eb6b4ce5f25b55a29a49':
  Add drop shadow to preview thumb

11 years agoMerge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 23:58:45 +0000 (23:58 +0000)]
Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce

11 years agoFix the verbose log
ztenghui [Wed, 8 May 2013 21:43:15 +0000 (14:43 -0700)]
Fix the verbose log

Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging.

bug:8771541

Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27

11 years agoAdd drop shadow to preview thumb
Michael Kolb [Wed, 8 May 2013 00:24:23 +0000 (17:24 -0700)]
Add drop shadow to preview thumb

  Bug: 8826241

Also, remove animateSlide blocker, it caused frozen review

Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9

11 years agoClose menu in onPause
Michael Kolb [Wed, 8 May 2013 23:05:04 +0000 (16:05 -0700)]
Close menu in onPause

  Bug: 8722672

Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc

11 years agoam 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub...
Sascha Haeberling [Wed, 8 May 2013 22:15:30 +0000 (15:15 -0700)]
am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce

* commit '58f32428768ff67520e0363de7a8c1929a4eac1f':
  Reduce max size of bitmap returned by crop dialog.

11 years agoMerge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
Sascha Haeberling [Wed, 8 May 2013 22:13:44 +0000 (22:13 +0000)]
Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce

11 years agoam c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 21:32:20 +0000 (14:32 -0700)]
am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce

* commit 'c3fde4b4032591fc34ce118860e53fe92c0b3706':
  Fix second level menu

11 years agoMerge "Fix second level menu" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 21:30:01 +0000 (21:30 +0000)]
Merge "Fix second level menu" into gb-ub-photos-bryce

11 years agoFix second level menu
Michael Kolb [Wed, 8 May 2013 18:14:35 +0000 (11:14 -0700)]
Fix second level menu

  Bug: 8857098

Added Countdown timer and picture size items

Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d

11 years agoReduce max size of bitmap returned by crop dialog.
Sascha Haeberling [Wed, 8 May 2013 21:00:42 +0000 (14:00 -0700)]
Reduce max size of bitmap returned by crop dialog.

  Bug: 8851336

Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6

11 years agoMerge "Further assets clean up." into jb-mr2-dev
Angus Kong [Wed, 8 May 2013 20:34:24 +0000 (20:34 +0000)]
Merge "Further assets clean up." into jb-mr2-dev

11 years agoFurther assets clean up.
Angus Kong [Mon, 6 May 2013 20:40:52 +0000 (13:40 -0700)]
Further assets clean up.

Remove unused assets and layouts.

bug:8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5

11 years agoam 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photo...
Angus Kong [Wed, 8 May 2013 18:17:43 +0000 (11:17 -0700)]
am 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce

* commit '188ad6eda97b4e05853d582198722e70f9e03705':
  DO NOT MERGE Further assets clean up.

11 years agoMerge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
Angus Kong [Wed, 8 May 2013 18:09:44 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce

11 years agoam 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 8 May 2013 17:50:29 +0000 (10:50 -0700)]
am 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce

* commit '9fcabfb535f9e094f77cbdba5305d04209adc0b3':
  Fix memory leak in SparseArrayBitmapPool

11 years agoDO NOT MERGE Further assets clean up.
Angus Kong [Mon, 6 May 2013 20:40:52 +0000 (13:40 -0700)]
DO NOT MERGE Further assets clean up.

Remove unused assets and layouts.

bug:8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5

11 years agoMerge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 8 May 2013 17:49:16 +0000 (17:49 +0000)]
Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce

11 years agoFix memory leak in SparseArrayBitmapPool
Bobby Georgescu [Tue, 7 May 2013 23:41:04 +0000 (16:41 -0700)]
Fix memory leak in SparseArrayBitmapPool

Bug: 8857493
Change-Id: Ie5fae457aea91973caa07f8955b1364df573821b

11 years agoam b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos...
Doris Liu [Wed, 8 May 2013 00:29:12 +0000 (17:29 -0700)]
am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce

* commit 'b281a6463f22c75c5b4a7a7079bdb55e484c2d07':
  Fix video capture intent overlapping buttons

11 years agoMerge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
Doris Liu [Wed, 8 May 2013 00:27:28 +0000 (00:27 +0000)]
Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce

11 years agoam 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:26:05 +0000 (17:26 -0700)]
am 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce

* commit '0a830ce4b5424ff9919b9156eb0635e671a67a81':
  Add animation to slice selection

11 years agoMerge "Add animation to slice selection" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:23:40 +0000 (00:23 +0000)]
Merge "Add animation to slice selection" into gb-ub-photos-bryce

11 years agoam 9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:22:56 +0000 (17:22 -0700)]
am 9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce

* commit '9a26f823b2894d3decf47b28ee10d08932b09adf':
  Remove unused assets

11 years agoMerge "Remove unused assets" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:20:44 +0000 (00:20 +0000)]
Merge "Remove unused assets" into gb-ub-photos-bryce

11 years agoRemove unused assets
Michael Kolb [Tue, 7 May 2013 22:58:47 +0000 (15:58 -0700)]
Remove unused assets

  Bug: 8656481

Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018

11 years agoFix video capture intent overlapping buttons
Doris Liu [Tue, 7 May 2013 20:48:10 +0000 (13:48 -0700)]
Fix video capture intent overlapping buttons

Bug: 8839010
Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0

11 years agoam 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb...
Sascha Haeberling [Tue, 7 May 2013 22:10:36 +0000 (15:10 -0700)]
am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce

* commit '6febbfc6c9c2d645f22fb200574fe14fa1201046':
  Avoid rounding errors from cropping uncropped images.

11 years agoMerge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
Sascha Haeberling [Tue, 7 May 2013 22:08:31 +0000 (22:08 +0000)]
Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce

11 years agoAdd animation to slice selection
Michael Kolb [Tue, 7 May 2013 20:53:19 +0000 (13:53 -0700)]
Add animation to slice selection

  Bug: 8826233

Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c

11 years agoam 48ce39b8: Fix review button placement
Michael Kolb [Tue, 7 May 2013 20:28:20 +0000 (13:28 -0700)]
am 48ce39b8: Fix review button placement

* commit '48ce39b881f60fde8c9a1536199980c31d38188c':
  Fix review button placement

11 years agoFix review button placement
Michael Kolb [Mon, 6 May 2013 23:14:09 +0000 (16:14 -0700)]
Fix review button placement

  Bug: 8833788

Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1

11 years agoAvoid rounding errors from cropping uncropped images.
Sascha Haeberling [Tue, 7 May 2013 18:04:08 +0000 (11:04 -0700)]
Avoid rounding errors from cropping uncropped images.

  Bug: 8736111

Also don't treat "none" as a non-modifying filter.

Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda

11 years agoam ed1224f1: Resize children to avoid laying out outside parent
Doris Liu [Tue, 7 May 2013 17:07:57 +0000 (10:07 -0700)]
am ed1224f1: Resize children to avoid laying out outside parent

* commit 'ed1224f1b98a1a534f5a3b18739465ed6114529a':
  Resize children to avoid laying out outside parent

11 years agoResize children to avoid laying out outside parent
Doris Liu [Tue, 7 May 2013 01:30:30 +0000 (18:30 -0700)]
Resize children to avoid laying out outside parent

Bug: 8838983
Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e

11 years agoam 08d2c513: Merge "Fix black background on save progress indicator." into gb-ub...
George Mount [Mon, 6 May 2013 20:41:42 +0000 (13:41 -0700)]
am 08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce

* commit '08d2c51392978383699aedcf63d24e5122b3b7a5':
  Fix black background on save progress indicator.

11 years agoMerge "Fix black background on save progress indicator." into gb-ub-photos-bryce
George Mount [Mon, 6 May 2013 20:40:25 +0000 (20:40 +0000)]
Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce

11 years agoam ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
Michael Kolb [Mon, 6 May 2013 20:22:34 +0000 (13:22 -0700)]
am ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce

* commit 'ea75136ae4abf55070644e5a048cf44323517c43':
  Fix lockscreen camera widget layout

11 years agoMerge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
Michael Kolb [Mon, 6 May 2013 20:21:19 +0000 (20:21 +0000)]
Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce

11 years agoFix lockscreen camera widget layout
Michael Kolb [Mon, 6 May 2013 19:41:34 +0000 (12:41 -0700)]
Fix lockscreen camera widget layout

  Bug: 8832891

Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236

11 years agoam 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce
Doris Liu [Mon, 6 May 2013 17:25:07 +0000 (10:25 -0700)]
am 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce

* commit '3a50eb36cf760ddb2a11c72b247f96611f3bf112':
  Restrict checking for device flip

11 years agoMerge "Restrict checking for device flip" into gb-ub-photos-bryce
Doris Liu [Mon, 6 May 2013 17:23:09 +0000 (17:23 +0000)]
Merge "Restrict checking for device flip" into gb-ub-photos-bryce

11 years agoFix black background on save progress indicator.
George Mount [Mon, 6 May 2013 17:06:53 +0000 (10:06 -0700)]
Fix black background on save progress indicator.

 Bug 8802092

Change-Id: I40075ba6af69895a88973d906436c6e235c733fa

11 years agoam 1e3bc7d4: Set correct label text in tap mode
Michael Kolb [Mon, 6 May 2013 16:59:59 +0000 (09:59 -0700)]
am 1e3bc7d4: Set correct label text in tap mode

* commit '1e3bc7d4873dbc0778d5e12333c73c00bcd6512f':
  Set correct label text in tap mode

11 years agoSet correct label text in tap mode
Michael Kolb [Mon, 6 May 2013 15:49:10 +0000 (08:49 -0700)]
Set correct label text in tap mode

  Bug: 8826229

Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b

11 years agoam 49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Sat, 4 May 2013 23:18:09 +0000 (16:18 -0700)]
am 49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '49a242256761f990001c3f81c54e4897f58ebc36':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Sat, 4 May 2013 23:16:41 +0000 (23:16 +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 [Sat, 4 May 2013 23:16:10 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoRestrict checking for device flip
Doris Liu [Fri, 3 May 2013 21:33:57 +0000 (14:33 -0700)]
Restrict checking for device flip

Bug: 8714114
Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 3 May 2013 20:37:04 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 3 May 2013 20:36:23 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam cd0fb7af: Fix NPE caused by insets never being set
Doris Liu [Fri, 3 May 2013 20:02:15 +0000 (13:02 -0700)]
am cd0fb7af: Fix NPE caused by insets never being set

* commit 'cd0fb7af20f855e1190122467c5650e46bfe820c':
  Fix NPE caused by insets never being set

11 years agoFix NPE caused by insets never being set
Doris Liu [Fri, 3 May 2013 18:44:45 +0000 (11:44 -0700)]
Fix NPE caused by insets never being set

Bug: 8804054
Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858

11 years agoam 4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos...
Doris Liu [Fri, 3 May 2013 18:10:57 +0000 (11:10 -0700)]
am 4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce

* commit '4b9dea3a1496271b73a7b5a4f62ad3bb3b5cdadc':
  Anchor camera controls when flipping device

11 years agoMerge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
Doris Liu [Fri, 3 May 2013 18:09:49 +0000 (18:09 +0000)]
Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce

11 years agoam b0a1e9fe: Don\'t show settings when popup is shown.
Angus Kong [Fri, 3 May 2013 17:41:49 +0000 (10:41 -0700)]
am b0a1e9fe: Don\'t show settings when popup is shown.

* commit 'b0a1e9fe925be1745bfb224867ee53562e027145':
  Don't show settings when popup is shown.

11 years agoAnchor camera controls when flipping device
Doris Liu [Fri, 3 May 2013 17:26:01 +0000 (10:26 -0700)]
Anchor camera controls when flipping device

Also adjusted margins for camera root view to avoid covering undo bar

Bug: 8758513
Bug: 8714114
Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4

11 years agoDon't show settings when popup is shown.
Angus Kong [Fri, 3 May 2013 00:45:01 +0000 (17:45 -0700)]
Don't show settings when popup is shown.

bug:8771618
Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50

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