OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 80e32c08: am 4c644f36: Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:15:11 +0000 (16:15 -0700)]
am 80e32c08: am 4c644f36: Fix to imports in NewPhotoModule.

* commit '80e32c082f971c88627692b3faa4656390439f66':
  Fix to imports in NewPhotoModule.

11 years agoam 4c644f36: Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:12:30 +0000 (16:12 -0700)]
am 4c644f36: Fix to imports in NewPhotoModule.

* commit '4c644f3687d88ea13ff82c3f79b36585ea2c387b':
  Fix to imports in NewPhotoModule.

11 years agoFix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:07:35 +0000 (16:07 -0700)]
Fix to imports in NewPhotoModule.

Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef

11 years agoam 1b34000f: am dcd1dd98: Merge "Moving crop to a separate activity. Refactoring...
Ruben Brunk [Tue, 9 Apr 2013 23:04:13 +0000 (16:04 -0700)]
am 1b34000f: am dcd1dd98: Merge "Moving crop to a separate activity.  Refactoring." into gb-ub-photos-bryce

* commit '1b34000f478e616a9681623385255418ed562ae6':
  Moving crop to a separate activity.  Refactoring.

11 years agoam dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub...
Ruben Brunk [Tue, 9 Apr 2013 23:01:18 +0000 (16:01 -0700)]
am dcd1dd98: Merge "Moving crop to a separate activity.  Refactoring." into gb-ub-photos-bryce

* commit 'dcd1dd986bc8455ce822e8d9e7a46ea103228351':
  Moving crop to a separate activity.  Refactoring.

11 years agoMerge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
Ruben Brunk [Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)]
Merge "Moving crop to a separate activity.  Refactoring." into gb-ub-photos-bryce

11 years agoMoving crop to a separate activity. Refactoring.
Ruben Brunk [Fri, 5 Apr 2013 00:20:42 +0000 (17:20 -0700)]
Moving crop to a separate activity.  Refactoring.

Bug: 8526929

Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce

11 years agoam 1d18d4f2: am 355eaea0: Merge "Add more gestures and animations in FilmStripView...
Angus Kong [Tue, 9 Apr 2013 21:53:46 +0000 (14:53 -0700)]
am 1d18d4f2: am 355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce

* commit '1d18d4f2552df090c3da69aba29faba00f813d6c':
  Add more gestures and animations in FilmStripView.

11 years agoam 355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub...
Angus Kong [Tue, 9 Apr 2013 21:51:58 +0000 (14:51 -0700)]
am 355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce

* commit '355eaea088a348c394909fea6c9f812ff25e87ac':
  Add more gestures and animations in FilmStripView.

11 years agoMerge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
Angus Kong [Tue, 9 Apr 2013 21:49:55 +0000 (21:49 +0000)]
Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce

11 years agoam 6b775d62: am 7811d8de: Merge "Refresh parameters during recording." into gb-ub...
Angus Kong [Tue, 9 Apr 2013 21:16:39 +0000 (14:16 -0700)]
am 6b775d62: am 7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce

* commit '6b775d626cffc2b863da881e800238816caae818':
  Refresh parameters during recording.

11 years agoam 7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce
Angus Kong [Tue, 9 Apr 2013 21:12:48 +0000 (14:12 -0700)]
am 7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce

* commit '7811d8def7fe1b9d6111566b55a18f6b137f487a':
  Refresh parameters during recording.

11 years agoMerge "Refresh parameters during recording." into gb-ub-photos-bryce
Angus Kong [Tue, 9 Apr 2013 21:09:38 +0000 (21:09 +0000)]
Merge "Refresh parameters during recording." into gb-ub-photos-bryce

11 years agoRefresh parameters during recording.
Angus Kong [Wed, 3 Apr 2013 23:56:18 +0000 (16:56 -0700)]
Refresh parameters during recording.

bug:8504803
Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66

11 years agoam 15d05dc7: am a4ff1776: Merge "Hide the category panel when editing" into gb-ub...
nicolasroard [Tue, 9 Apr 2013 20:38:59 +0000 (13:38 -0700)]
am 15d05dc7: am a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce

* commit '15d05dc79cdea1a43284883679093c8c5ac943a7':
  Hide the category panel when editing

11 years agoam a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 20:35:18 +0000 (13:35 -0700)]
am a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce

* commit 'a4ff177637432e9f1e5eeb29b9c5dc6bb2949b2a':
  Hide the category panel when editing

11 years agoMerge "Hide the category panel when editing" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 20:33:04 +0000 (20:33 +0000)]
Merge "Hide the category panel when editing" into gb-ub-photos-bryce

11 years agoHide the category panel when editing
nicolasroard [Tue, 9 Apr 2013 18:46:53 +0000 (11:46 -0700)]
Hide the category panel when editing

Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96

11 years agoam 34d607c8: am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce
John Hoford [Tue, 9 Apr 2013 20:08:44 +0000 (13:08 -0700)]
am 34d607c8: am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce

* commit '34d607c88f26252325058eaa76dfead319bb6eb6':
  ui cleanup

11 years agoam ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce
John Hoford [Tue, 9 Apr 2013 20:05:48 +0000 (13:05 -0700)]
am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce

* commit 'ddcb0880c9748ce9a77f1472864977c767f46f0f':
  ui cleanup

11 years agoam 16eafe60: am f79a935f: Remove unneeded READ_SMS permission
Bobby Georgescu [Tue, 9 Apr 2013 20:05:23 +0000 (13:05 -0700)]
am 16eafe60: am f79a935f: Remove unneeded READ_SMS permission

* commit '16eafe6016a70ae9d6e31461321ec5c7b5933aa6':
  Remove unneeded READ_SMS permission

11 years agoam f79a935f: Remove unneeded READ_SMS permission
Bobby Georgescu [Tue, 9 Apr 2013 20:02:35 +0000 (13:02 -0700)]
am f79a935f: Remove unneeded READ_SMS permission

* commit 'f79a935f1ce85c55c8fba0b46dee362c653a8a78':
  Remove unneeded READ_SMS permission

11 years agoMerge "ui cleanup" into gb-ub-photos-bryce
John Hoford [Tue, 9 Apr 2013 20:02:06 +0000 (20:02 +0000)]
Merge "ui cleanup" into gb-ub-photos-bryce

11 years agoui cleanup
John Hoford [Tue, 9 Apr 2013 18:51:42 +0000 (11:51 -0700)]
ui cleanup

Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01

11 years agoRemove unneeded READ_SMS permission
Bobby Georgescu [Mon, 8 Apr 2013 17:14:14 +0000 (10:14 -0700)]
Remove unneeded READ_SMS permission

Bug: 8469283
Change-Id: I0d211705fe1fb86dc0ce85230e82d500f0202291

11 years agoam a5d3f7e3: am fb063617: Work in progress - Put preview in TextureView
Doris Liu [Tue, 9 Apr 2013 17:56:41 +0000 (10:56 -0700)]
am a5d3f7e3: am fb063617: Work in progress - Put preview in TextureView

* commit 'a5d3f7e3c7b75a6c8315770e39c5b241a7693ec2':
  Work in progress - Put preview in TextureView

11 years agoam fb063617: Work in progress - Put preview in TextureView
Doris Liu [Tue, 9 Apr 2013 17:54:03 +0000 (10:54 -0700)]
am fb063617: Work in progress - Put preview in TextureView

* commit 'fb0636179335a7786ec2c0edf9889a55596db126':
  Work in progress - Put preview in TextureView

11 years agoWork in progress - Put preview in TextureView
Doris Liu [Fri, 15 Mar 2013 04:01:35 +0000 (21:01 -0700)]
Work in progress - Put preview in TextureView

Fixed gesture recognizing and pie menu.
Fixed camera picker. Exposure setting got fixed with rebasing.
Rebased for new pie menu
Fixed camera mode switch listener

Ongoing: secure album, aspect ratio for video recording on ICS

Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1

11 years agoam 6177241b: am b1c75f60: Fix panel color background in landscape
nicolasroard [Tue, 9 Apr 2013 16:51:28 +0000 (09:51 -0700)]
am 6177241b: am b1c75f60: Fix panel color background in landscape

* commit '6177241b8b2fc91c627abbf88dca95a7cd35ff81':
  Fix panel color background in landscape

11 years agoam b1c75f60: Fix panel color background in landscape
nicolasroard [Tue, 9 Apr 2013 16:49:34 +0000 (09:49 -0700)]
am b1c75f60: Fix panel color background in landscape

* commit 'b1c75f6028ecbf7bd05f945c542da0f848bc594b':
  Fix panel color background in landscape

11 years agoFix panel color background in landscape
nicolasroard [Tue, 9 Apr 2013 16:46:17 +0000 (09:46 -0700)]
Fix panel color background in landscape

Change-Id: Id1a0470c8df5fe39f5504a43e1602672ac0d584d

11 years agoam f35ee031: am 01a4beb1: Fix history original image Change 1st and 2nd panel backgro...
nicolasroard [Tue, 9 Apr 2013 16:04:55 +0000 (09:04 -0700)]
am f35ee031: am 01a4beb1: Fix history original image Change 1st and 2nd panel background color

* commit 'f35ee0318655de92bb37c3763c750f8cff77131d':
  Fix history original image Change 1st and 2nd panel background color

11 years agoam 01a4beb1: Fix history original image Change 1st and 2nd panel background color
nicolasroard [Tue, 9 Apr 2013 16:03:12 +0000 (09:03 -0700)]
am 01a4beb1: Fix history original image Change 1st and 2nd panel background color

* commit '01a4beb197d74dddf788efaf6aedef434dfb8f8f':
  Fix history original image Change 1st and 2nd panel background color

11 years agoFix history original image
nicolasroard [Tue, 9 Apr 2013 15:57:59 +0000 (08:57 -0700)]
Fix history original image
Change 1st and 2nd panel background color

Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add

11 years agoam 5aff32af: am 948a4e6e: Fix history panel first appearance
nicolasroard [Tue, 9 Apr 2013 15:45:26 +0000 (08:45 -0700)]
am 5aff32af: am 948a4e6e: Fix history panel first appearance

* commit '5aff32afed49528cb104cdcf912bedf6f3440d9b':
  Fix history panel first appearance

11 years agoam 948a4e6e: Fix history panel first appearance
nicolasroard [Tue, 9 Apr 2013 15:42:02 +0000 (08:42 -0700)]
am 948a4e6e: Fix history panel first appearance

* commit '948a4e6e38d8d9ec9926877524478d6692437105':
  Fix history panel first appearance

11 years agoFix history panel first appearance
nicolasroard [Tue, 9 Apr 2013 15:18:18 +0000 (08:18 -0700)]
Fix history panel first appearance

Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22

11 years agoam 8fafeaff: am d98f781d: Fix positioning of cancel/done buttons
nicolasroard [Tue, 9 Apr 2013 04:14:03 +0000 (21:14 -0700)]
am 8fafeaff: am d98f781d: Fix positioning of cancel/done buttons

* commit '8fafeaff4820fe88cd9f854c79fac90b8040f5c2':
  Fix positioning of cancel/done buttons

11 years agoam d98f781d: Fix positioning of cancel/done buttons
nicolasroard [Tue, 9 Apr 2013 04:10:13 +0000 (21:10 -0700)]
am d98f781d: Fix positioning of cancel/done buttons

* commit 'd98f781dd0899477ff5be42279a06da81fd6e526':
  Fix positioning of cancel/done buttons

11 years agoFix positioning of cancel/done buttons
nicolasroard [Tue, 9 Apr 2013 03:54:45 +0000 (20:54 -0700)]
Fix positioning of cancel/done buttons

Change-Id: Ie229a20d882841444ece28a3ab63cbc6ea916699

11 years agoam 923140cf: am 1fe7caee: Fix crash in curves
nicolasroard [Tue, 9 Apr 2013 03:20:28 +0000 (20:20 -0700)]
am 923140cf: am 1fe7caee: Fix crash in curves

* commit '923140cf2301ed611568cb9da3a88a725d2328f0':
  Fix crash in curves

11 years agoam 1fe7caee: Fix crash in curves
nicolasroard [Tue, 9 Apr 2013 03:17:02 +0000 (20:17 -0700)]
am 1fe7caee: Fix crash in curves

* commit '1fe7caeeaab314cd70d0b54f8f3dd3225c71c081':
  Fix crash in curves

11 years agoam 70071d7b: am 16652433: make basic editor based on ParametricEditor
John Hoford [Tue, 9 Apr 2013 03:11:47 +0000 (20:11 -0700)]
am 70071d7b: am 16652433: make basic editor based on ParametricEditor

* commit '70071d7b940debe0ddf77c8306ce33dcadc35638':
  make basic editor based on ParametricEditor

11 years agoam 16652433: make basic editor based on ParametricEditor
John Hoford [Tue, 9 Apr 2013 03:09:47 +0000 (20:09 -0700)]
am 16652433: make basic editor based on ParametricEditor

* commit '166524339e9f8ad86c0922142b961776e0da3d8f':
  make basic editor based on ParametricEditor

11 years agoFix crash in curves
nicolasroard [Tue, 9 Apr 2013 03:07:47 +0000 (20:07 -0700)]
Fix crash in curves

Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49

11 years agomake basic editor based on ParametricEditor
John Hoford [Tue, 9 Apr 2013 02:32:45 +0000 (19:32 -0700)]
make basic editor based on ParametricEditor

Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61

11 years agoam 78561589: am 719fa31b: Deactivate Vintage & BW Color FX
nicolasroard [Tue, 9 Apr 2013 02:25:27 +0000 (19:25 -0700)]
am 78561589: am 719fa31b: Deactivate Vintage & BW Color FX

* commit '78561589c611172fd0a1b4644416c4ea03022ac1':
  Deactivate Vintage & BW Color FX

11 years agoam 719fa31b: Deactivate Vintage & BW Color FX
nicolasroard [Tue, 9 Apr 2013 02:21:29 +0000 (19:21 -0700)]
am 719fa31b: Deactivate Vintage & BW Color FX

* commit '719fa31bc4df6605f45a65feb504d5c4e6e59db3':
  Deactivate Vintage & BW Color FX

11 years agoDeactivate Vintage & BW Color FX
nicolasroard [Tue, 9 Apr 2013 02:06:51 +0000 (19:06 -0700)]
Deactivate Vintage & BW Color FX

bug:8503451
Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587

11 years agoam e507b716: am 387fffa4: Merge "Add menu item to start the simple editor" into gb...
nicolasroard [Tue, 9 Apr 2013 01:56:31 +0000 (18:56 -0700)]
am e507b716: am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

* commit 'e507b716011e8a99f006f7009704fc0f87f0c3c4':
  Add menu item to start the simple editor

11 years agoam 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 01:54:18 +0000 (18:54 -0700)]
am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

* commit '387fffa4034e94336d5b2b28bf2cf7d0a9cf6048':
  Add menu item to start the simple editor

11 years agoam 17f6f33a: am 5317e540: Bump up the version number to 1.1.40009
Bart Sears [Tue, 9 Apr 2013 01:53:02 +0000 (18:53 -0700)]
am 17f6f33a: am 5317e540: Bump up the version number to 1.1.40009

* commit '17f6f33acf86bf90d22f73aa7257a00ec0663fa4':
  Bump up the version number to 1.1.40009

11 years agoMerge "Add menu item to start the simple editor" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 01:50:45 +0000 (01:50 +0000)]
Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

11 years agoam 5317e540: Bump up the version number to 1.1.40009
Bart Sears [Tue, 9 Apr 2013 01:49:07 +0000 (18:49 -0700)]
am 5317e540: Bump up the version number to 1.1.40009

* commit '5317e54019bc1c88c82333a9e42882623691270f':
  Bump up the version number to 1.1.40009

11 years agoAdd menu item to start the simple editor
nicolasroard [Tue, 9 Apr 2013 01:16:17 +0000 (18:16 -0700)]
Add menu item to start the simple editor

Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0

11 years agoBump up the version number to 1.1.40009
Bart Sears [Tue, 9 Apr 2013 01:12:07 +0000 (18:12 -0700)]
Bump up the version number to 1.1.40009

Change-Id: Ia266e6493a535cd4ae36fda2fa497195b810ebb4

11 years agoam 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce
Tim Murray [Mon, 8 Apr 2013 22:09:11 +0000 (15:09 -0700)]
am 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce

* commit '893ea430c9d3f78291843e22f4370319af0b2451':
  Allow use of texture.

11 years agoam 3627907b: am a8d4e882: Merge "Limit creation of greyscale converter RS script...
Tim Murray [Mon, 8 Apr 2013 22:09:11 +0000 (15:09 -0700)]
am 3627907b: am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

* commit '3627907b3bfdb03c596fe01437a3fc4300ad25a1':
  Limit creation of greyscale converter RS script.

11 years agoam 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce
Tim Murray [Mon, 8 Apr 2013 22:05:15 +0000 (15:05 -0700)]
am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce

* commit '31721073a7fae162a931f1d4998b12101a98916c':
  Allow use of texture.

11 years agoam a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub...
Tim Murray [Mon, 8 Apr 2013 22:05:15 +0000 (15:05 -0700)]
am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

* commit 'a8d4e88207432fc07385d49245ca2221d6fe0be9':
  Limit creation of greyscale converter RS script.

11 years agoMerge "Allow use of texture." into gb-ub-photos-bryce
Tim Murray [Mon, 8 Apr 2013 22:02:01 +0000 (22:02 +0000)]
Merge "Allow use of texture." into gb-ub-photos-bryce

11 years agoMerge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce
Tim Murray [Mon, 8 Apr 2013 22:01:53 +0000 (22:01 +0000)]
Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

11 years agoAllow use of texture.
Tim Murray [Mon, 8 Apr 2013 21:33:51 +0000 (14:33 -0700)]
Allow use of texture.

Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf

11 years agoLimit creation of greyscale converter RS script.
Tim Murray [Mon, 8 Apr 2013 17:35:09 +0000 (10:35 -0700)]
Limit creation of greyscale converter RS script.

Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067

11 years agoam a97306fc: am f1d6d21d: Increase the CHAR LIMIT for color_pick_select
John Hoford [Mon, 8 Apr 2013 21:37:41 +0000 (14:37 -0700)]
am a97306fc: am f1d6d21d: Increase the CHAR LIMIT for color_pick_select

* commit 'a97306fc282087e6a67347d5f6c36923962b16df':
  Increase the CHAR LIMIT for color_pick_select

11 years agoAdd more gestures and animations in FilmStripView.
Angus Kong [Fri, 5 Apr 2013 18:17:19 +0000 (11:17 -0700)]
Add more gestures and animations in FilmStripView.

Now supports fullscreen mode and filmstrip mode.

Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f

11 years agoam f1d6d21d: Increase the CHAR LIMIT for color_pick_select
John Hoford [Mon, 8 Apr 2013 21:34:03 +0000 (14:34 -0700)]
am f1d6d21d: Increase the CHAR LIMIT for color_pick_select

* commit 'f1d6d21dfcf59d69a7ba8a3658fcedbf2aa04779':
  Increase the CHAR LIMIT for color_pick_select

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 8 Apr 2013 20:36:23 +0000 (13:36 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I4014afe3d67f5b17d5877083bdea8e34bf32ab9e

11 years agoIncrease the CHAR LIMIT for color_pick_select
John Hoford [Mon, 8 Apr 2013 19:40:17 +0000 (12:40 -0700)]
Increase the CHAR LIMIT for color_pick_select

bug:  8131770
Change-Id: I665316d3ff6ec10fcace8ee1bb9237f4057a4797

11 years agoam 4b87a0bd: am 7ce32619: support for simplified computed icons
John Hoford [Mon, 8 Apr 2013 16:18:12 +0000 (09:18 -0700)]
am 4b87a0bd: am 7ce32619: support for simplified computed icons

* commit '4b87a0bdc331993b0bc6fa46efb11b62abcc8dfb':
  support for simplified computed icons

11 years agoam 7ce32619: support for simplified computed icons
John Hoford [Mon, 8 Apr 2013 16:14:07 +0000 (09:14 -0700)]
am 7ce32619: support for simplified computed icons

* commit '7ce32619d3f107125d219b80c4041681a0bd85cc':
  support for simplified computed icons

11 years agosupport for simplified computed icons
John Hoford [Fri, 5 Apr 2013 15:48:39 +0000 (08:48 -0700)]
support for simplified computed icons

Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 8 Apr 2013 12:56:50 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam be89575f: am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb...
Bart Sears [Fri, 5 Apr 2013 23:59:15 +0000 (16:59 -0700)]
am be89575f: am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

* commit 'be89575f1dd99651b3e4979bd5eda06c13ab54b0':
  Bump up the version number to 1.1.40008

11 years agoam 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce
Bart Sears [Fri, 5 Apr 2013 23:54:04 +0000 (16:54 -0700)]
am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

* commit '08ac58de117c2b8c24ef8b4eabca6d25ae581ff3':
  Bump up the version number to 1.1.40008

11 years agoMerge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce
Bart Sears [Fri, 5 Apr 2013 23:51:42 +0000 (23:51 +0000)]
Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

11 years agoam 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags.
Ruben Brunk [Fri, 5 Apr 2013 23:48:39 +0000 (16:48 -0700)]
am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags.

* commit '351f96eeacc4342385ee2d215af1322ac079cfdc':
  Added check to strip out uninitialized EXIF tags.

11 years agoam c59be382: Added check to strip out uninitialized EXIF tags.
Ruben Brunk [Fri, 5 Apr 2013 23:44:56 +0000 (16:44 -0700)]
am c59be382: Added check to strip out uninitialized EXIF tags.

* commit 'c59be38287ed3d58f6945d63713b03ac20510c22':
  Added check to strip out uninitialized EXIF tags.

11 years agoAdded check to strip out uninitialized EXIF tags.
Ruben Brunk [Fri, 5 Apr 2013 23:22:55 +0000 (16:22 -0700)]
Added check to strip out uninitialized EXIF tags.

Bug: 8552339
Change-Id: Ib6ae4f59f9e393e5f6b46877a4b2c3b2fe1852d3

11 years agoBump up the version number to 1.1.40008
Bart Sears [Fri, 5 Apr 2013 21:55:58 +0000 (14:55 -0700)]
Bump up the version number to 1.1.40008

Change-Id: I42dce1bc936b54a4d4f72c2179d2f1d9e27f72d7

11 years agoam 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Fri, 5 Apr 2013 19:09:01 +0000 (12:09 -0700)]
am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '20b837a995a150ec4024324dd1b6874ff4f9113f':
  Import translations. DO NOT MERGE

11 years agoam 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 5 Apr 2013 19:09:00 +0000 (12:09 -0700)]
am 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '88154ff2a4c440732aafdc80776e41affe9d8980':
  Import translations. DO NOT MERGE

11 years agoam f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 5 Apr 2013 19:07:13 +0000 (12:07 -0700)]
am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 5 Apr 2013 19:02:23 +0000 (19:02 +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, 5 Apr 2013 19:02:11 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

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

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

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

11 years agoam b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb...
Michael Kolb [Fri, 5 Apr 2013 17:14:50 +0000 (10:14 -0700)]
am b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce

* commit 'b94167bd52a343d0c74a3b8bc0523f1747490a7e':
  Don't add unsupported options to menu

11 years agoam 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 5 Apr 2013 17:11:41 +0000 (10:11 -0700)]
am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce

* commit '5e1e5a5e301491249d24c9f3a4d1014d07e72985':
  Don't add unsupported options to menu

11 years agoMerge "Don't add unsupported options to menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 5 Apr 2013 17:08:40 +0000 (17:08 +0000)]
Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce

11 years agoDon't add unsupported options to menu
Michael Kolb [Fri, 5 Apr 2013 16:52:55 +0000 (09:52 -0700)]
Don't add unsupported options to menu

  Bug: 8549712

Exposure compensation and whitebalance were not checked when added
to the menu.

Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df

11 years agoam e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce
ztenghui [Thu, 4 Apr 2013 23:05:30 +0000 (16:05 -0700)]
am e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce

* commit 'e9ba7351f6598ec950c6df007448567dcaa555b6':
  Remove redudant setName

11 years agoam 5e575401: am 4f58f875: Bump up the version number to 1.1.40007
Bart Sears [Thu, 4 Apr 2013 23:05:29 +0000 (16:05 -0700)]
am 5e575401: am 4f58f875: Bump up the version number to 1.1.40007

* commit '5e575401757d93c4d18ba40f05d146bbdf6e9e6f':
  Bump up the version number to 1.1.40007

11 years agoam 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce
ztenghui [Thu, 4 Apr 2013 23:00:59 +0000 (16:00 -0700)]
am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce

* commit '214f786938fd0924ec89190b5f38d034f0be7291':
  Remove redudant setName

11 years agoam 4f58f875: Bump up the version number to 1.1.40007
Bart Sears [Thu, 4 Apr 2013 23:00:58 +0000 (16:00 -0700)]
am 4f58f875: Bump up the version number to 1.1.40007

* commit '4f58f87598044f3742d6faaf1ac8ff777c7dcffc':
  Bump up the version number to 1.1.40007

11 years agoMerge "Remove redudant setName" into gb-ub-photos-bryce
ztenghui [Thu, 4 Apr 2013 22:57:41 +0000 (22:57 +0000)]
Merge "Remove redudant setName" into gb-ub-photos-bryce

11 years agoBump up the version number to 1.1.40007
Bart Sears [Thu, 4 Apr 2013 22:07:12 +0000 (15:07 -0700)]
Bump up the version number to 1.1.40007

Change-Id: Ia494e2c210f642ec0232394d0cfabaf5e1b8f96a

11 years agoRemove redudant setName
ztenghui [Thu, 4 Apr 2013 17:28:43 +0000 (10:28 -0700)]
Remove redudant setName

Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c

11 years agoam e65a9f48: am 3b763852: Merge "fixed the value that quality was getting set to...
John Hoford [Thu, 4 Apr 2013 15:50:24 +0000 (08:50 -0700)]
am e65a9f48: am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce

* commit 'e65a9f48a545f6ed2043e89cbe6637aeadf6c30a':
  fixed the value that quality was getting set to

11 years agoam 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photo...
John Hoford [Thu, 4 Apr 2013 15:46:22 +0000 (08:46 -0700)]
am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce

* commit '3b7638527bf8f472bedf99ed412d692e4031d03e':
  fixed the value that quality was getting set to