OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:25:23 +0000 (17:25 -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 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb...
Sascha Haeberling [Tue, 7 May 2013 22:09:54 +0000 (15:09 -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:26:39 +0000 (13:26 -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:08:13 +0000 (10:08 -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 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce
Doris Liu [Mon, 6 May 2013 17:24:54 +0000 (10:24 -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 agoam 1e3bc7d4: Set correct label text in tap mode
Michael Kolb [Mon, 6 May 2013 16:59:46 +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 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 agoam cd0fb7af: Fix NPE caused by insets never being set
Doris Liu [Fri, 3 May 2013 20:02:56 +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:11:38 +0000 (11:11 -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:42:30 +0000 (10:42 -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:58 +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:34 +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 00259461: Fix UI
nicolasroard [Thu, 2 May 2013 03:30:04 +0000 (20:30 -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 5a352be0: Increase selection limit
Bobby Georgescu [Thu, 2 May 2013 00:49:38 +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 agoMerge "G+ activity xform stack and pipeline cleanup." into gb-ub-photos-carlsbad
Ruben Brunk [Wed, 1 May 2013 23:08:26 +0000 (23:08 +0000)]
Merge "G+ activity xform stack and pipeline cleanup." into gb-ub-photos-carlsbad

11 years agofix crash due to no ImageFilterDraw
John Hoford [Wed, 1 May 2013 22:50:30 +0000 (15:50 -0700)]
fix crash due to no ImageFilterDraw

Change-Id: I0c8bfaa7d162f5c1a49f05d853f4700322fe5901

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 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 agoFix new activity menus
Michael Kolb [Wed, 1 May 2013 20:59:37 +0000 (13:59 -0700)]
Fix new activity menus

Change-Id: If8ace52a46284b41169532b69bdf77305b9610d9

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

* commit 'c43e5b6bd84f5a7635766f70677097f6958f4058':
  Update capture animation

11 years agoam 9ea4147f: Update location indicator correctly
Michael Kolb [Wed, 1 May 2013 20:31:36 +0000 (13:31 -0700)]
am 9ea4147f: Update location indicator correctly

* commit '9ea4147f6220e3a9fb6f9ae3fef46036919641b4':
  Update location indicator correctly

11 years agoam 64c9c183: Adjust switcher animation
Michael Kolb [Wed, 1 May 2013 20:31:35 +0000 (13:31 -0700)]
am 64c9c183: Adjust switcher animation

* commit '64c9c183384b9df6dafe0142f10c4f7b802d54bf':
  Adjust switcher animation

11 years agoam b048226f: Merge "Align review controls" into gb-ub-photos-bryce
Michael Kolb [Wed, 1 May 2013 20:31:35 +0000 (13:31 -0700)]
am b048226f: Merge "Align review controls" into gb-ub-photos-bryce

* commit 'b048226feed739f122ffb39fca51fedaec791e67':
  Align review controls

11 years agoam fe804d11: Handle onDowngrade in PhotoDatabase
Mangesh Ghiware [Wed, 1 May 2013 20:31:34 +0000 (13:31 -0700)]
am fe804d11: Handle onDowngrade in PhotoDatabase

* commit 'fe804d11f398b3c03b4a6ccffcfdac56e1728de4':
  Handle onDowngrade in PhotoDatabase

11 years agoam ce8f6d1b: Remove empty slots from menu
Michael Kolb [Wed, 1 May 2013 20:31:33 +0000 (13:31 -0700)]
am ce8f6d1b: Remove empty slots from menu

* commit 'ce8f6d1bb9dc52da7d168a94cb4c6f24d631d304':
  Remove empty slots from menu

11 years agoam 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce
Michael Kolb [Wed, 1 May 2013 20:22:18 +0000 (13:22 -0700)]
am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce

* commit '9c525edf6440b6daf10885f4f7a0da479b7f2707':
  Remove timer indicator

11 years agoresolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad
John Hoford [Wed, 1 May 2013 20:19:06 +0000 (13:19 -0700)]
resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad

Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4

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 agoG+ activity xform stack and pipeline cleanup.
Ruben Brunk [Wed, 1 May 2013 01:56:25 +0000 (18:56 -0700)]
G+ activity xform stack and pipeline cleanup.

Change-Id: I3277dd4e709146ca2c06b56a1db200d3130dd5e3

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 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 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 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 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 "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 agoMerge "Modifications for simple edit" into gb-ub-photos-carlsbad
nicolasroard [Tue, 30 Apr 2013 00:52:16 +0000 (00:52 +0000)]
Merge "Modifications for simple edit" into gb-ub-photos-carlsbad

11 years agoModifications for simple edit
nicolasroard [Fri, 26 Apr 2013 21:51:48 +0000 (14:51 -0700)]
Modifications for simple edit

Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f

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 ef878669: Fix indicator layout
Michael Kolb [Mon, 29 Apr 2013 23:04:00 +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 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
Ruben Brunk [Mon, 29 Apr 2013 18:54:51 +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 384971f7: Instrument importer for usage statistics
Bobby Georgescu [Mon, 29 Apr 2013 18:03:40 +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 a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
Angus Kong [Fri, 26 Apr 2013 23:33:00 +0000 (16:33 -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 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photo...
Bobby Georgescu [Fri, 26 Apr 2013 23:20:54 +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 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 23:01:44 +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 568a8cf9: Dismiss MTP notification on device disconnect
Bobby Georgescu [Fri, 26 Apr 2013 22:32:36 +0000 (15:32 -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 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 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 ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos...
Bobby Georgescu [Fri, 26 Apr 2013 18:52:16 +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 agoam d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 18:11:07 +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:06 +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 5ed7c697: (-s ours) Merge "Remove new camera activity code from Bryce" into gb...
Doris Liu [Fri, 26 Apr 2013 17:19:49 +0000 (10:19 -0700)]
am 5ed7c697: (-s ours) 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 37177f96: Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce
Doris Liu [Fri, 26 Apr 2013 16:52:40 +0000 (09:52 -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 eda2f0ce: Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos...
Ruben Brunk [Fri, 26 Apr 2013 04:19:36 +0000 (21:19 -0700)]
am eda2f0ce: Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce

* commit 'eda2f0ce805ee078715b17df7a935e967218a7df':
  Fix offset and ASCII type handling in exif.

11 years agoam d5060931: Merge "Remove UI param for straighten." into gb-ub-photos-bryce
Ruben Brunk [Fri, 26 Apr 2013 04:19:36 +0000 (21:19 -0700)]
am d5060931: Merge "Remove UI param for straighten." into gb-ub-photos-bryce

* commit 'd50609310e425df36e340120c794f08691d55808':
  Remove UI param for straighten.

11 years agoShow notification to relaunch MTP importer
Bobby Georgescu [Fri, 26 Apr 2013 01:10:18 +0000 (18:10 -0700)]
Show notification to relaunch MTP importer

Bug: 8158516
Change-Id: I98a57f9ac6e6935595b44e1277ddffa378065068

11 years agoMerge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce
Ruben Brunk [Fri, 26 Apr 2013 00:57:50 +0000 (00:57 +0000)]
Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce

11 years agoMerge "Remove UI param for straighten." into gb-ub-photos-bryce
Ruben Brunk [Fri, 26 Apr 2013 00:57:38 +0000 (00:57 +0000)]
Merge "Remove UI param for straighten." into gb-ub-photos-bryce

11 years agoMake sure the initial rotation is set
Doris Liu [Thu, 25 Apr 2013 23:56:43 +0000 (16:56 -0700)]
Make sure the initial rotation is set

Bug: 8718884
Change-Id: I4d1890f5dc9a4838b84872b1de395440757a7b4b

11 years agoRemove new camera activity code from Bryce
Doris Liu [Thu, 25 Apr 2013 20:41:12 +0000 (13:41 -0700)]
Remove new camera activity code from Bryce

Bug: 8722017
Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a

11 years agoFix offset and ASCII type handling in exif.
Ruben Brunk [Thu, 25 Apr 2013 20:10:53 +0000 (13:10 -0700)]
Fix offset and ASCII type handling in exif.

Bug: 8713891
Change-Id: I8adaf1bc42eea2cda741d149de5f1a64c3e4c74c

11 years agoam 69f5d8cb: Fixes EDIT intents.
Ruben Brunk [Thu, 25 Apr 2013 19:48:52 +0000 (12:48 -0700)]
am 69f5d8cb: Fixes EDIT intents.

* commit '69f5d8cbf51422454257a00d7959b2e8d50cb0ca':
  Fixes EDIT intents.

11 years agoFixes EDIT intents.
Ruben Brunk [Wed, 24 Apr 2013 22:46:15 +0000 (15:46 -0700)]
Fixes EDIT intents.

Bug: 8712238

Change-Id: I63bb07dc304b2745a29e3bf7510e8b38ccb59c48

11 years agoam 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce
Doris Liu [Thu, 25 Apr 2013 17:26:32 +0000 (10:26 -0700)]
am 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce

* commit '2e7f1704c6a30f0d6febfa6ac29d5b3f665c656c':
  Avoid rendering underneath nav bar