OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 3bd9aa89: am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow...
George Mount [Mon, 4 Mar 2013 23:55:20 +0000 (23:55 +0000)]
am 3bd9aa89: am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

* commit '3bd9aa89c398e0a319647bc98b7bb5b60bdde847':
  Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk

11 years agoam 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to...
George Mount [Mon, 4 Mar 2013 23:53:50 +0000 (23:53 +0000)]
am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

* commit '6f99159695f952b4e2d1d3a968354bdd3b9e4e64':
  Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk

11 years agoam 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against...
George Mount [Mon, 4 Mar 2013 23:49:05 +0000 (15:49 -0800)]
am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

* commit '8438e10230fe1ce102e5c29f8eac6c96e4eec900':
  Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk

11 years agoMerge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle...
George Mount [Mon, 4 Mar 2013 23:47:29 +0000 (23:47 +0000)]
Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

11 years agoUpdate PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
George Mount [Thu, 28 Feb 2013 18:52:59 +0000 (10:52 -0800)]
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk

Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c

11 years agoam 14427b5e: am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos...
Bobby Georgescu [Mon, 4 Mar 2013 20:37:44 +0000 (20:37 +0000)]
am 14427b5e: am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce

* commit '14427b5e98bfbad82c263fe1a060a3040107fc8c':
  Clean up comments

11 years agoam 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 4 Mar 2013 20:35:57 +0000 (20:35 +0000)]
am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce

* commit '8dab2ccb07e41a5b5fa9b53cc3290cb42c508978':
  Clean up comments

11 years agoam 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 4 Mar 2013 20:34:19 +0000 (12:34 -0800)]
am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce

* commit '4cf62cd1c8ee14a7e4b698f0be49ceba00f1b085':
  Clean up comments

11 years agoMerge "Clean up comments" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 4 Mar 2013 20:32:43 +0000 (20:32 +0000)]
Merge "Clean up comments" into gb-ub-photos-bryce

11 years agoClean up comments
Bobby Georgescu [Mon, 4 Mar 2013 20:29:42 +0000 (12:29 -0800)]
Clean up comments

Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c

11 years agoam dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 4 Mar 2013 19:10:06 +0000 (19:10 +0000)]
am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'dd3f00a05b018b94209a1f32f5d5d384c071285e':
  Fix for applied ratios
  Fix crop ratio

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 4 Mar 2013 19:06:56 +0000 (11:06 -0800)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I33a0b7686aaf8e8a10c3ec222b673297ad7e76a1

11 years agoam cb0103e2: am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb...
Doris Liu [Mon, 4 Mar 2013 18:41:46 +0000 (18:41 +0000)]
am cb0103e2: am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce

* commit 'cb0103e283880817a4f02a5381b04b68f89a4879':
  Flatten view hierarchy and rotate views

11 years agoam fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
Doris Liu [Mon, 4 Mar 2013 18:37:29 +0000 (10:37 -0800)]
am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce

* commit 'fa7440b031c06a8c69e19ee0f6a3d44a0beb8e71':
  Flatten view hierarchy and rotate views

11 years agoMerge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
Doris Liu [Mon, 4 Mar 2013 18:36:36 +0000 (18:36 +0000)]
Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce

11 years agoFlatten view hierarchy and rotate views
Doris Liu [Tue, 26 Feb 2013 18:54:25 +0000 (10:54 -0800)]
Flatten view hierarchy and rotate views

TODO: SRI pano and Lightcycle can use a bit more flattening.
I will get to them next. (Maybe in a different CL.)

TODO: Need to cancel capture animation in onConfigurationChanged()

Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 4 Mar 2013 13:56:10 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam f960b10f: am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions...
Bobby Georgescu [Sun, 3 Mar 2013 00:29:05 +0000 (00:29 +0000)]
am f960b10f: am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce

* commit 'f960b10f37a395216dcf173f861f38ba018bf494':
  Refactor AutoThumbnailDrawable, fix race conditions

11 years agoam e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb...
Bobby Georgescu [Sun, 3 Mar 2013 00:24:02 +0000 (16:24 -0800)]
am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce

* commit 'e118ac5340f04b2cd8e421bee3f85db723a51d38':
  Refactor AutoThumbnailDrawable, fix race conditions

11 years agoMerge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce
Bobby Georgescu [Sat, 2 Mar 2013 18:10:37 +0000 (18:10 +0000)]
Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce

11 years agoRefactor AutoThumbnailDrawable, fix race conditions
Bobby Georgescu [Fri, 1 Mar 2013 22:09:51 +0000 (14:09 -0800)]
Refactor AutoThumbnailDrawable, fix race conditions

Change-Id: I80243ee177387e0d9b309acb5a7c1d364cc73530

11 years agoam 9655fd0b: am d64f356d: Bump up the version number to 1.1.40003
Bart Sears [Sat, 2 Mar 2013 02:24:17 +0000 (02:24 +0000)]
am 9655fd0b: am d64f356d: Bump up the version number to 1.1.40003

* commit '9655fd0b137c254785da24d17aedecca7c25af80':
  Bump up the version number to 1.1.40003

11 years agoam d64f356d: Bump up the version number to 1.1.40003
Bart Sears [Sat, 2 Mar 2013 02:21:46 +0000 (18:21 -0800)]
am d64f356d: Bump up the version number to 1.1.40003

* commit 'd64f356dfbd8d555a8a474bb61af3b2d2b40b208':
  Bump up the version number to 1.1.40003

11 years agoBump up the version number to 1.1.40003
Bart Sears [Sat, 2 Mar 2013 02:11:07 +0000 (18:11 -0800)]
Bump up the version number to 1.1.40003

Change-Id: I696aae61f9f3c61d810e3bb78e2b804ca2106173

11 years agoam fd2a70f1: am 276a04db: Fix preview rendering speed...
nicolasroard [Fri, 1 Mar 2013 23:04:04 +0000 (23:04 +0000)]
am fd2a70f1: am 276a04db: Fix preview rendering speed...

* commit 'fd2a70f17e4e1e97f0d7921473fa07eb2e516b81':
  Fix preview rendering speed...

11 years agoam 276a04db: Fix preview rendering speed...
nicolasroard [Fri, 1 Mar 2013 22:59:38 +0000 (14:59 -0800)]
am 276a04db: Fix preview rendering speed...

* commit '276a04dbeb9202239a6a6fec4109ad3c38ba4d5d':
  Fix preview rendering speed...

11 years agoFix preview rendering speed...
nicolasroard [Fri, 1 Mar 2013 22:54:16 +0000 (14:54 -0800)]
Fix preview rendering speed...

Change-Id: I6a6ba3c14a91d60446f28f5dce52fd3c4bc49f79

11 years agoam accef0c1: am 36633e24: Fix disappearing border thumbnails
nicolasroard [Fri, 1 Mar 2013 22:48:10 +0000 (22:48 +0000)]
am accef0c1: am 36633e24: Fix disappearing border thumbnails

* commit 'accef0c1368ef25027cbd7545279abfe6833cb60':
  Fix disappearing border thumbnails

11 years agoam 36633e24: Fix disappearing border thumbnails
nicolasroard [Fri, 1 Mar 2013 22:42:23 +0000 (14:42 -0800)]
am 36633e24: Fix disappearing border thumbnails

* commit '36633e241115ff047fff3da5450bbd75adb343f1':
  Fix disappearing border thumbnails

11 years agoFix disappearing border thumbnails
nicolasroard [Fri, 1 Mar 2013 22:39:25 +0000 (14:39 -0800)]
Fix disappearing border thumbnails

Change-Id: I9ed43646a353658a590354f13e51dc96fa760442

11 years agoam bbc7c4aa: am 3a5556d3: Improves State panel and Refactor FilterShowActivity -...
nicolasroard [Fri, 1 Mar 2013 22:15:14 +0000 (22:15 +0000)]
am bbc7c4aa: am 3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

* commit 'bbc7c4aa6e1329e3ca844e02eed586ae589b5bdf':
  Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

11 years agoam 3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple...
nicolasroard [Fri, 1 Mar 2013 22:10:08 +0000 (14:10 -0800)]
am 3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

* commit '3a5556d3ce5dba33021867468ae0d5d222f256db':
  Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)

11 years agoam 6bd8caa9: am 87835aa0: fix imports
John Hoford [Fri, 1 Mar 2013 22:00:25 +0000 (22:00 +0000)]
am 6bd8caa9: am 87835aa0: fix imports

* commit '6bd8caa97e53bb50cb48792262a42fbf516c04fc':
  fix imports

11 years agoam 87835aa0: fix imports
John Hoford [Fri, 1 Mar 2013 21:56:59 +0000 (13:56 -0800)]
am 87835aa0: fix imports

* commit '87835aa01412f9ba20eb57ac0cbbad3a19b48623':
  fix imports

11 years agoImproves State panel and Refactor FilterShowActivity
nicolasroard [Thu, 28 Feb 2013 20:11:35 +0000 (12:11 -0800)]
Improves State panel and Refactor FilterShowActivity
- handles multiple xml layout
- add a portrait layout
- improves the state panel (delete, etc.)

Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2

11 years agofix imports
John Hoford [Fri, 1 Mar 2013 21:43:32 +0000 (13:43 -0800)]
fix imports

Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7

11 years agoam 1c73be8d: am 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height...
John Reck [Fri, 1 Mar 2013 21:43:10 +0000 (21:43 +0000)]
am 1c73be8d: am 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce

* commit '1c73be8d249a646f6e7cfe3aba62ad61bae0b90d':
  Fix crash if a tile ends up with a width or height of 0

11 years agoam 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into...
John Reck [Fri, 1 Mar 2013 21:36:48 +0000 (13:36 -0800)]
am 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce

* commit '3a60b6bc3f972dcd3ff6b7812b7ebaf5ca2e4a58':
  Fix crash if a tile ends up with a width or height of 0

11 years agoam bbec362e: am 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce
John Hoford [Fri, 1 Mar 2013 21:36:36 +0000 (21:36 +0000)]
am bbec362e: am 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce

* commit 'bbec362ec2b624063e9abd5d63164aeda7c2239b':
  fixed hiding of tiny planet

11 years agoMerge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos...
John Reck [Fri, 1 Mar 2013 21:35:49 +0000 (21:35 +0000)]
Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce

11 years agoam 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce
John Hoford [Fri, 1 Mar 2013 21:32:40 +0000 (13:32 -0800)]
am 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce

* commit '7b9a9475f04b7f6a547c66a5446f651f2b7c693e':
  fixed hiding of tiny planet

11 years agoMerge "fixed hiding of tiny planet" into gb-ub-photos-bryce
John Hoford [Fri, 1 Mar 2013 21:31:50 +0000 (21:31 +0000)]
Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce

11 years agofixed hiding of tiny planet
John Hoford [Fri, 1 Mar 2013 21:22:57 +0000 (13:22 -0800)]
fixed hiding of tiny planet

Change-Id: I0d23a640cf4aee5ae03e6552637ba3663db85bde

11 years agoFix crash if a tile ends up with a width or height of 0
John Reck [Fri, 1 Mar 2013 21:27:28 +0000 (13:27 -0800)]
Fix crash if a tile ends up with a width or height of 0

 Bug: 8242279

Change-Id: Id8f9d85b46f07fb5aea8063a081524b9a3d992ae

11 years agoam a96e88e1: am e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce
John Reck [Fri, 1 Mar 2013 19:36:32 +0000 (19:36 +0000)]
am a96e88e1: am e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce

* commit 'a96e88e16b28f4221dbae1ef92863bffcaadf1c1':
  Add full screen image view

11 years agoam e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce
John Reck [Fri, 1 Mar 2013 19:31:59 +0000 (11:31 -0800)]
am e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce

* commit 'e2fd033b6d836365779f3db73d8f0f305e1d9a62':
  Add full screen image view

11 years agoMerge "Add full screen image view" into gb-ub-photos-bryce
John Reck [Fri, 1 Mar 2013 19:30:34 +0000 (19:30 +0000)]
Merge "Add full screen image view" into gb-ub-photos-bryce

11 years agoAdd full screen image view
John Reck [Thu, 28 Feb 2013 00:48:16 +0000 (16:48 -0800)]
Add full screen image view

Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4

11 years agoam 8d20a142: (-s ours) am 0cc98a35: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 1 Mar 2013 19:18:07 +0000 (19:18 +0000)]
am 8d20a142: (-s ours) am 0cc98a35: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '8d20a142761ce42a428a9c7b37c15348aebcab0e':
  Import translations. DO NOT MERGE

11 years agoam 41bd81d4: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 1 Mar 2013 19:18:07 +0000 (19:18 +0000)]
am 41bd81d4: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '41bd81d4d4292d0b63aa09002b7ecd6d2a7c04ff':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 1 Mar 2013 19:14:49 +0000 (19:14 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoam 2d4bb18f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 1 Mar 2013 19:09:59 +0000 (19:09 +0000)]
am 2d4bb18f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '2d4bb18f3d07368b3275e40f0dea931806b0e065':
  Import translations. DO NOT MERGE

11 years agoam 0cc98a35: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 1 Mar 2013 19:09:40 +0000 (11:09 -0800)]
am 0cc98a35: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '0cc98a35565ee8df2aa04f3f83da15fe30c2af5c':
  Import translations. DO NOT MERGE

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 1 Mar 2013 19:06:58 +0000 (19:06 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoam e2bc2bc1: am 08c0f250: Fix race condition
John Reck [Fri, 1 Mar 2013 19:01:22 +0000 (19:01 +0000)]
am e2bc2bc1: am 08c0f250: Fix race condition

* commit 'e2bc2bc14fcd23c47459db937bcc9a74d4900f32':
  Fix race condition

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Mar 2013 19:00:47 +0000 (11:00 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Mar 2013 19:00:27 +0000 (11:00 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Mar 2013 18:59:48 +0000 (10:59 -0800)]
Import translations. DO NOT MERGE

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

11 years agoam 08c0f250: Fix race condition
John Reck [Fri, 1 Mar 2013 18:58:30 +0000 (10:58 -0800)]
am 08c0f250: Fix race condition

* commit '08c0f25091f20c4d618b5adaa381ed6eedf4695f':
  Fix race condition

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Mar 2013 18:58:28 +0000 (10:58 -0800)]
Import translations. DO NOT MERGE

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

11 years agoFix race condition
John Reck [Fri, 1 Mar 2013 18:23:42 +0000 (10:23 -0800)]
Fix race condition

Change-Id: I6cf9207d067d4c0c3c4271d6ce6f44b213d7296b

11 years agoam cb206ef2: am d26f1ad5: Clarify threading, cleanup locking
John Reck [Fri, 1 Mar 2013 01:30:49 +0000 (01:30 +0000)]
am cb206ef2: am d26f1ad5: Clarify threading, cleanup locking

* commit 'cb206ef2a7d40faf5cad8c3c399ab5d9b691d4ad':
  Clarify threading, cleanup locking

11 years agoam d26f1ad5: Clarify threading, cleanup locking
John Reck [Fri, 1 Mar 2013 01:26:57 +0000 (17:26 -0800)]
am d26f1ad5: Clarify threading, cleanup locking

* commit 'd26f1ad5a859da0847ab181df2eebd45e155118b':
  Clarify threading, cleanup locking

11 years agoClarify threading, cleanup locking
John Reck [Fri, 1 Mar 2013 00:20:37 +0000 (16:20 -0800)]
Clarify threading, cleanup locking

 Bug: 8285317

Change-Id: I8b1b0eda74a41f388e97fee6bcd4ce948bb6e15a

11 years agoFix for applied ratios
nicolasroard [Thu, 28 Feb 2013 21:45:14 +0000 (13:45 -0800)]
Fix for applied ratios

Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9

11 years agoFix crop ratio
nicolasroard [Thu, 28 Feb 2013 20:59:53 +0000 (12:59 -0800)]
Fix crop ratio

bug:8291961

Change-Id: Ia279c35115fbfc0774505bf3318b7fac7d84d2eb

11 years agoam 3dbb86aa: am 839d529f: Fix for applied ratios
nicolasroard [Thu, 28 Feb 2013 22:44:43 +0000 (22:44 +0000)]
am 3dbb86aa: am 839d529f: Fix for applied ratios

* commit '3dbb86aa2ca64789bb4f590e82c8928912e861bc':
  Fix for applied ratios

11 years agoam 1147fa4d: am 92720495: Fix crop ratio
nicolasroard [Thu, 28 Feb 2013 22:38:54 +0000 (22:38 +0000)]
am 1147fa4d: am 92720495: Fix crop ratio

* commit '1147fa4d0451638cb594a2bc02da77069c379641':
  Fix crop ratio

11 years agoam 4ef217e2: am e8c2b314: Revert "Cleanup ImagePreset"
Nicolas Roard [Thu, 28 Feb 2013 22:38:24 +0000 (22:38 +0000)]
am 4ef217e2: am e8c2b314: Revert "Cleanup ImagePreset"

* commit '4ef217e23dd911eac1ffa0dfa980ace525fd1e72':
  Revert "Cleanup ImagePreset"

11 years agoam 3c981e55: am 0f076567: Cleanup ImagePreset
nicolasroard [Thu, 28 Feb 2013 22:38:23 +0000 (22:38 +0000)]
am 3c981e55: am 0f076567: Cleanup ImagePreset

* commit '3c981e5536ff859f60429a6b7b2226163817bc0e':
  Cleanup ImagePreset

11 years agoam 8b0656a1: am be61c1fc: crop fix
John Hoford [Thu, 28 Feb 2013 22:38:23 +0000 (22:38 +0000)]
am 8b0656a1: am be61c1fc: crop fix

* commit '8b0656a17708f02fe14dd798d25aa8ff30740dd4':
  crop fix

11 years agoam d418d297: am e1c3724f: Fix full res preview
nicolasroard [Thu, 28 Feb 2013 22:38:07 +0000 (22:38 +0000)]
am d418d297: am e1c3724f: Fix full res preview

* commit 'd418d29782276e3a93effdaaaee82316e013480a':
  Fix full res preview

11 years agoam d7222545: am 65e47f69: Fix scale and full res preview
nicolasroard [Thu, 28 Feb 2013 22:37:57 +0000 (22:37 +0000)]
am d7222545: am 65e47f69: Fix scale and full res preview

* commit 'd722254587b96a7d67bddffcceb9c99fe2fab7b7':
  Fix scale and full res preview

11 years agoam fbc653f7: am cad3dd97: Merge "refactor the geometry code" into gb-ub-photos-bryce
John Hoford [Thu, 28 Feb 2013 22:37:56 +0000 (22:37 +0000)]
am fbc653f7: am cad3dd97: Merge "refactor the geometry code" into gb-ub-photos-bryce

* commit 'fbc653f77564784d560eb98553f2f7c41749dba5':
  refactor the geometry code

11 years agoam 839d529f: Fix for applied ratios
nicolasroard [Thu, 28 Feb 2013 22:37:41 +0000 (14:37 -0800)]
am 839d529f: Fix for applied ratios

* commit '839d529f800adcd1ef5fcd262322bc939c2c2089':
  Fix for applied ratios

11 years agoam 44e1e65f: am 94c06451: Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce
Justin Koh [Thu, 28 Feb 2013 22:16:33 +0000 (22:16 +0000)]
am 44e1e65f: am 94c06451: Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce

* commit '44e1e65f81184e8fe53ec25601d097c49b19bace':
  Updated Gallery2 with Pano.

11 years agoFix for applied ratios
nicolasroard [Thu, 28 Feb 2013 21:45:14 +0000 (13:45 -0800)]
Fix for applied ratios

Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9

11 years agoam 92720495: Fix crop ratio
nicolasroard [Thu, 28 Feb 2013 21:13:04 +0000 (13:13 -0800)]
am 92720495: Fix crop ratio

* commit '92720495a2cac79c373bbcc9ccdd0191d746c7c0':
  Fix crop ratio

11 years agoFix crop ratio
nicolasroard [Thu, 28 Feb 2013 20:59:53 +0000 (12:59 -0800)]
Fix crop ratio

bug:8291961

Change-Id: Ia279c35115fbfc0774505bf3318b7fac7d84d2eb

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 28 Feb 2013 13:55:58 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam e8c2b314: Revert "Cleanup ImagePreset"
Nicolas Roard [Thu, 28 Feb 2013 06:01:24 +0000 (22:01 -0800)]
am e8c2b314: Revert "Cleanup ImagePreset"

* commit 'e8c2b314d8f3c5d79227fae97a0ec1ca68a1e611':
  Revert "Cleanup ImagePreset"

11 years agoRevert "Cleanup ImagePreset"
Nicolas Roard [Thu, 28 Feb 2013 06:00:05 +0000 (06:00 +0000)]
Revert "Cleanup ImagePreset"

This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01

Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545

11 years agoam 0f076567: Cleanup ImagePreset
nicolasroard [Thu, 28 Feb 2013 05:19:04 +0000 (21:19 -0800)]
am 0f076567: Cleanup ImagePreset

* commit '0f0765676e5be73c7187a44ee88e500ab691bf01':
  Cleanup ImagePreset

11 years agoCleanup ImagePreset
nicolasroard [Thu, 28 Feb 2013 04:45:05 +0000 (20:45 -0800)]
Cleanup ImagePreset

Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e

11 years agoam be61c1fc: crop fix
John Hoford [Thu, 28 Feb 2013 04:44:41 +0000 (20:44 -0800)]
am be61c1fc: crop fix

* commit 'be61c1fcfae87f00d2b3111b15e90bbf4a88b6bc':
  crop fix

11 years agocrop fix
John Hoford [Thu, 28 Feb 2013 03:21:38 +0000 (19:21 -0800)]
crop fix

Change-Id: Ie2e79992bf45fffb0ae00c4a4fd879546fa1450f

11 years agoam e1c3724f: Fix full res preview
nicolasroard [Thu, 28 Feb 2013 02:33:55 +0000 (18:33 -0800)]
am e1c3724f: Fix full res preview

* commit 'e1c3724ff23c91d8e6d783545fb0f2d3bba8ce2b':
  Fix full res preview

11 years agoFix full res preview
nicolasroard [Thu, 28 Feb 2013 01:55:16 +0000 (17:55 -0800)]
Fix full res preview

Change-Id: Ia727d06b9ff9866dfbb883968a23c0ed105e57fa

11 years agoam 65e47f69: Fix scale and full res preview
nicolasroard [Thu, 28 Feb 2013 01:49:35 +0000 (17:49 -0800)]
am 65e47f69: Fix scale and full res preview

* commit '65e47f698043f95ed8067e8c41397c472e5e433a':
  Fix scale and full res preview

11 years agoFix scale and full res preview
nicolasroard [Thu, 28 Feb 2013 01:47:06 +0000 (17:47 -0800)]
Fix scale and full res preview

Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d

11 years agoam cad3dd97: Merge "refactor the geometry code" into gb-ub-photos-bryce
John Hoford [Thu, 28 Feb 2013 01:45:27 +0000 (17:45 -0800)]
am cad3dd97: Merge "refactor the geometry code" into gb-ub-photos-bryce

* commit 'cad3dd97f0c169b22e9d55e5ef38384075a4f4be':
  refactor the geometry code

11 years agoMerge "refactor the geometry code" into gb-ub-photos-bryce
John Hoford [Thu, 28 Feb 2013 01:43:44 +0000 (01:43 +0000)]
Merge "refactor the geometry code" into gb-ub-photos-bryce

11 years agorefactor the geometry code
John Hoford [Wed, 27 Feb 2013 16:41:19 +0000 (08:41 -0800)]
refactor the geometry code

Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a

11 years agoam 94c06451: Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce
Justin Koh [Wed, 27 Feb 2013 23:45:32 +0000 (15:45 -0800)]
am 94c06451: Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce

* commit '94c06451103e8e6b43c927f2248b814bd803a6dc':
  Updated Gallery2 with Pano.

11 years agoMerge "Updated Gallery2 with Pano." into gb-ub-photos-bryce
Justin Koh [Wed, 27 Feb 2013 23:43:00 +0000 (23:43 +0000)]
Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce

11 years agoUpdated Gallery2 with Pano.
Justin Koh [Wed, 27 Feb 2013 23:31:29 +0000 (15:31 -0800)]
Updated Gallery2 with Pano.

Updated Gallery2 with Pano.
Bug: 8263808

Change-Id: Iedaba9dc478fb20480f3b37e9708bc8d67cf6003

11 years agoam 6be07666: am 7b17c647: Merge "Highlight menu selection better" into gb-ub-photos...
Michael Kolb [Wed, 27 Feb 2013 23:23:40 +0000 (23:23 +0000)]
am 6be07666: am 7b17c647: Merge "Highlight menu selection better" into gb-ub-photos-bryce

* commit '6be076663ad36ab74c69a99c8d7b55f74d3d9d82':
  Highlight menu selection better

11 years agoam 4b55a247: (-s ours) am c1424ad2: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 27 Feb 2013 23:23:20 +0000 (23:23 +0000)]
am 4b55a247: (-s ours) am c1424ad2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '4b55a24719c8065fc5ad63e3cf629b50ae7b858f':
  Import translations. DO NOT MERGE