OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam b7a8e45e: am 8de13111: 1:1 zoom integration
Doris Liu [Thu, 29 Aug 2013 21:49:29 +0000 (14:49 -0700)]
am b7a8e45e: am 8de13111: 1:1 zoom integration

* commit 'b7a8e45e727ef2a3e57ae6a9aea96eb23b3e7039':
  1:1 zoom integration

11 years agoam 8de13111: 1:1 zoom integration
Doris Liu [Thu, 29 Aug 2013 21:47:26 +0000 (14:47 -0700)]
am 8de13111: 1:1 zoom integration

* commit '8de13111cc4e62da3462ea321d18c7951282e0d0':
  1:1 zoom integration

11 years ago1:1 zoom integration
Doris Liu [Fri, 23 Aug 2013 20:35:24 +0000 (13:35 -0700)]
1:1 zoom integration

Bug: 10308195
Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8

11 years agoam 734c25b9: am 0df03318: Merge "Flip capture thumb when using front facing camera...
Doris Liu [Thu, 29 Aug 2013 00:07:27 +0000 (17:07 -0700)]
am 734c25b9: am 0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad

* commit '734c25b9c17e5f824863c24843c7265d37bda1d5':
  Flip capture thumb when using front facing camera

11 years agoam 0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub...
Doris Liu [Thu, 29 Aug 2013 00:04:12 +0000 (17:04 -0700)]
am 0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad

* commit '0df03318d36f77aaec11238854921bd45f50c035':
  Flip capture thumb when using front facing camera

11 years agoMerge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
Doris Liu [Thu, 29 Aug 2013 00:02:22 +0000 (00:02 +0000)]
Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad

11 years agoFlip capture thumb when using front facing camera
Doris Liu [Wed, 28 Aug 2013 21:28:45 +0000 (14:28 -0700)]
Flip capture thumb when using front facing camera

Bug: 10495008
Change-Id: I9f444625e64be35afe44b0d7f50d81fbd1936ae8

11 years agoam 72b0220a: am 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos...
ztenghui [Wed, 28 Aug 2013 20:56:10 +0000 (13:56 -0700)]
am 72b0220a: am 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad

* commit '72b0220acf98afae4c1b9a3ba8f32f62e20b7159':
  Add rotate support in Film Strip

11 years agoam 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
ztenghui [Wed, 28 Aug 2013 20:55:04 +0000 (13:55 -0700)]
am 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad

* commit '2d1c49c2959d8b5adecd8bb5668fd50c1bf0190c':
  Add rotate support in Film Strip

11 years agoMerge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
ztenghui [Wed, 28 Aug 2013 20:52:25 +0000 (20:52 +0000)]
Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad

11 years agoAdd rotate support in Film Strip
ztenghui [Fri, 23 Aug 2013 18:47:56 +0000 (11:47 -0700)]
Add rotate support in Film Strip

Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.

bug:10367037
Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d

11 years agoam 659df48f: am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into...
Tenghui Zhu [Wed, 28 Aug 2013 16:56:43 +0000 (09:56 -0700)]
am 659df48f: am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad

* commit '659df48f1a84eb4498cd615ad79f39a7f45d7306':
  Revert "Add rotate support in Film Strip"

11 years agoam 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos...
Tenghui Zhu [Wed, 28 Aug 2013 16:54:26 +0000 (09:54 -0700)]
am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad

* commit '09d5983dfbd252fca56ee8368906156e69a9fed0':
  Revert "Add rotate support in Film Strip"

11 years agoMerge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad
Tenghui Zhu [Wed, 28 Aug 2013 16:50:48 +0000 (16:50 +0000)]
Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad

11 years agoRevert "Add rotate support in Film Strip"
Tenghui Zhu [Wed, 28 Aug 2013 16:47:42 +0000 (16:47 +0000)]
Revert "Add rotate support in Film Strip"

This reverts commit 568ad02f9fd3993abf4b973bdd49a34737267c77.

Change-Id: I300376126b55191e4112b8aabf3f9f61cc27fef6

11 years agoam 7cd724ae: am 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos...
ztenghui [Wed, 28 Aug 2013 16:31:53 +0000 (09:31 -0700)]
am 7cd724ae: am 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad

* commit '7cd724ae6acf09a641110e0bb46d28f9a932c1e8':
  Add rotate support in Film Strip

11 years agoam 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
ztenghui [Wed, 28 Aug 2013 16:30:18 +0000 (09:30 -0700)]
am 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad

* commit '80e2e1eca93d1df72420eb6d1b7db88460620b6e':
  Add rotate support in Film Strip

11 years agoMerge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
ztenghui [Wed, 28 Aug 2013 16:28:13 +0000 (16:28 +0000)]
Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad

11 years agoAdd rotate support in Film Strip
ztenghui [Fri, 23 Aug 2013 18:47:56 +0000 (11:47 -0700)]
Add rotate support in Film Strip

Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.

bug:10367037

Change-Id: I0b8128a806fa9e777a87967b294555daadced1c5

11 years agoam f4d1ee6e: am 7446e9fd: Use the well-translated camera_label instead of app_name.
Sascha Haeberling [Tue, 27 Aug 2013 20:39:32 +0000 (13:39 -0700)]
am f4d1ee6e: am 7446e9fd: Use the well-translated camera_label instead of app_name.

* commit 'f4d1ee6ea91d630178595d955b6b96cdb2a1fe4e':
  Use the well-translated camera_label instead of app_name.

11 years agoam 7446e9fd: Use the well-translated camera_label instead of app_name.
Sascha Haeberling [Tue, 27 Aug 2013 20:35:27 +0000 (13:35 -0700)]
am 7446e9fd: Use the well-translated camera_label instead of app_name.

* commit '7446e9fde7cd8dd7904beff592e8819513797ab9':
  Use the well-translated camera_label instead of app_name.

11 years agoUse the well-translated camera_label instead of app_name.
Sascha Haeberling [Tue, 27 Aug 2013 19:54:17 +0000 (12:54 -0700)]
Use the well-translated camera_label instead of app_name.

  Bug: 10509953

Change-Id: Ia5522fce1892e521c12fcc2f152afe7009026ac5

11 years agoam accdf4ca: am 18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos...
Mangesh Ghiware [Tue, 27 Aug 2013 17:13:03 +0000 (10:13 -0700)]
am accdf4ca: am 18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad

* commit 'accdf4ca62021676ded6cf30c69faa849df5d660':
  Bring back Share to filmstrip

11 years agoam 18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad
Mangesh Ghiware [Tue, 27 Aug 2013 17:10:40 +0000 (10:10 -0700)]
am 18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad

* commit '18d1d26a6da997bc0d9aa4d5688203f36c15377a':
  Bring back Share to filmstrip

11 years agoMerge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad
Mangesh Ghiware [Tue, 27 Aug 2013 17:08:51 +0000 (17:08 +0000)]
Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad

11 years agoam 8ada875a: am 00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 27 Aug 2013 01:33:33 +0000 (18:33 -0700)]
am 8ada875a: am 00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad

* commit '8ada875abf96d99246d212d9e88ce2e70d28faf7':
  Remove RefocusHelper.

11 years agoam 00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 27 Aug 2013 01:31:38 +0000 (18:31 -0700)]
am 00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad

* commit '00279bbcf7926189a7ae944988f6eceb91aae422':
  Remove RefocusHelper.

11 years agoMerge "Remove RefocusHelper." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 27 Aug 2013 00:39:40 +0000 (00:39 +0000)]
Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad

11 years agoam 5d26fdfd: am 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos...
Sascha Haeberling [Tue, 27 Aug 2013 00:27:14 +0000 (17:27 -0700)]
am 5d26fdfd: am 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad

* commit '5d26fdfdc2746c8c6f70b947b43722bc576dc1c3':
  Remove Refocus string and icon

11 years agoam 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 27 Aug 2013 00:22:24 +0000 (17:22 -0700)]
am 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad

* commit '143eb46b81202601e5454d460ea80a4796ecf43d':
  Remove Refocus string and icon

11 years agoRemove RefocusHelper.
Sascha Haeberling [Tue, 27 Aug 2013 00:21:48 +0000 (17:21 -0700)]
Remove RefocusHelper.

  Bug: 10494566

Change-Id: I0e5c665867fe324883ff199327df1ef3736cc7c7

11 years agoMerge "Remove Refocus string and icon" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 27 Aug 2013 00:20:12 +0000 (00:20 +0000)]
Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad

11 years agoRemove Refocus string and icon
Sascha Haeberling [Mon, 26 Aug 2013 23:55:53 +0000 (16:55 -0700)]
Remove Refocus string and icon

  Bug: 10494566

Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372

11 years agoBring back Share to filmstrip
Mangesh Ghiware [Fri, 23 Aug 2013 20:28:21 +0000 (13:28 -0700)]
Bring back Share to filmstrip

Bug: 10367406
Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0

11 years agoam 1cc08fea: Merge "Adding back the camera tests to KLP-DEV after sorting them out...
Yu Shan Emily Lau [Mon, 26 Aug 2013 23:07:28 +0000 (16:07 -0700)]
am 1cc08fea: Merge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into klp-dev

* commit '1cc08feaf523d478dcf50bafdec0cf5b0a93c01b':
  Adding back the camera tests to KLP-DEV after sorting them out in UB.

11 years agoMerge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into...
Yu Shan Emily Lau [Mon, 26 Aug 2013 23:03:26 +0000 (23:03 +0000)]
Merge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into klp-dev

11 years agoam d9114beb: am 3be7f94c: Make parsing integers for details dialog more robust.
Sascha Haeberling [Mon, 26 Aug 2013 22:05:46 +0000 (15:05 -0700)]
am d9114beb: am 3be7f94c: Make parsing integers for details dialog more robust.

* commit 'd9114beb2829c17f43c006bf368438834e71ce7a':
  Make parsing integers for details dialog more robust.

11 years agoam 919284cf: am 80af7dd8: Fix full-screen swipe layout.
Angus Kong [Mon, 26 Aug 2013 22:02:28 +0000 (15:02 -0700)]
am 919284cf: am 80af7dd8: Fix full-screen swipe layout.

* commit '919284cf30980d0f2a01c2ca37046039e0b7d713':
  Fix full-screen swipe layout.

11 years agoam dfb722fd: am a2818f58: Merge "Bring back undo delete confirmation." into gb-ub...
Angus Kong [Mon, 26 Aug 2013 22:02:04 +0000 (15:02 -0700)]
am dfb722fd: am a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad

* commit 'dfb722fd542d23b5908446fcc70c22caa7e08c8f':
  Bring back undo delete confirmation.

11 years agoam 3be7f94c: Make parsing integers for details dialog more robust.
Sascha Haeberling [Mon, 26 Aug 2013 21:56:40 +0000 (14:56 -0700)]
am 3be7f94c: Make parsing integers for details dialog more robust.

* commit '3be7f94c1029728a8e236cfcde9c8bce68244095':
  Make parsing integers for details dialog more robust.

11 years agoMake parsing integers for details dialog more robust.
Sascha Haeberling [Mon, 26 Aug 2013 21:40:03 +0000 (14:40 -0700)]
Make parsing integers for details dialog more robust.

  Bug: 7141309

Change-Id: I031e2f062ea786acb94d41385c5913c47d719ccd

11 years agoAdding back the camera tests to KLP-DEV after sorting them out in UB.
Jason Noguchi [Thu, 22 Aug 2013 22:58:29 +0000 (15:58 -0700)]
Adding back the camera tests to KLP-DEV after sorting them out in UB.

Change-Id: I963aa71a31580fd42edc17a5f226b6d2c02b6f79

11 years agoam 80af7dd8: Fix full-screen swipe layout.
Angus Kong [Fri, 23 Aug 2013 21:44:22 +0000 (14:44 -0700)]
am 80af7dd8: Fix full-screen swipe layout.

* commit '80af7dd871547d03ee9ff5023cbec00b1d8677ee':
  Fix full-screen swipe layout.

11 years agoFix full-screen swipe layout.
Angus Kong [Fri, 23 Aug 2013 04:00:19 +0000 (21:00 -0700)]
Fix full-screen swipe layout.

  bug:10428905

Change-Id: Ie4907735cc86f2d10bd936ce2d9af54cccab7ece

11 years agoam a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad
Angus Kong [Fri, 23 Aug 2013 20:43:05 +0000 (13:43 -0700)]
am a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad

* commit 'a2818f58b829f07021d69a36a831dcf339e9258a':
  Bring back undo delete confirmation.

11 years agoMerge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad
Angus Kong [Fri, 23 Aug 2013 20:21:59 +0000 (20:21 +0000)]
Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad

11 years agoBring back undo delete confirmation.
Angus Kong [Thu, 22 Aug 2013 01:28:43 +0000 (18:28 -0700)]
Bring back undo delete confirmation.

Also corrects the default decoding size.

  bug:10413110
  bug:10330214

Change-Id: I45465fdea2320501fd17ac4e35e0f0f54c08cbba

11 years agoam f2b312dd: am e2fb9943: Proper I18N of the Details dialog, especially for RTL.
Sascha Haeberling [Fri, 23 Aug 2013 00:51:29 +0000 (17:51 -0700)]
am f2b312dd: am e2fb9943: Proper I18N of the Details dialog, especially for RTL.

* commit 'f2b312ddb528d9faed743ed8d23d93789a572d34':
  Proper I18N of the Details dialog, especially for RTL.

11 years agoam e2fb9943: Proper I18N of the Details dialog, especially for RTL.
Sascha Haeberling [Fri, 23 Aug 2013 00:49:07 +0000 (17:49 -0700)]
am e2fb9943: Proper I18N of the Details dialog, especially for RTL.

* commit 'e2fb9943fb2d5a51a651f138d88473bf7f62e0b9':
  Proper I18N of the Details dialog, especially for RTL.

11 years agoProper I18N of the Details dialog, especially for RTL.
Sascha Haeberling [Thu, 22 Aug 2013 20:49:46 +0000 (13:49 -0700)]
Proper I18N of the Details dialog, especially for RTL.

  Bug: 7141309

Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b

11 years agoam 779160b3: am 00373f8a: Merge "Speed up filmstrip by not decoding with default...
Sascha Haeberling [Thu, 22 Aug 2013 23:13:13 +0000 (16:13 -0700)]
am 779160b3: am 00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad

* commit '779160b3411588dfd018974f83414996dfb97665':
  Speed up filmstrip by not decoding with default 3000px.

11 years agoam d567d7d5: am ce2acbcb: Fix preview thumb orientation
Doris Liu [Thu, 22 Aug 2013 23:13:13 +0000 (16:13 -0700)]
am d567d7d5: am ce2acbcb: Fix preview thumb orientation

* commit 'd567d7d51fc84b9abb9bb5b3c6bf46855234a480':
  Fix preview thumb orientation

11 years agoam 0174828e: am f737ac48: Merge "Add support to "go-to-next" in film strip." into...
Angus Kong [Thu, 22 Aug 2013 23:13:12 +0000 (16:13 -0700)]
am 0174828e: am f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad

* commit '0174828e574bc7c94c90be0dce7b3831983b0ff8':
  Add support to "go-to-next" in film strip.

11 years agoam 64335cf3: am 56f16746: Merge "Fix video capture animation and video snapshot anima...
Doris Liu [Thu, 22 Aug 2013 23:13:12 +0000 (16:13 -0700)]
am 64335cf3: am 56f16746: Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad

* commit '64335cf39cf7c94a6457160ef6d272b01f360167':
  Fix video capture animation and video snapshot animation

11 years agoam 10096771: am 15396ca6: Merge "Fix delete animation in fullscreen mode." into gb...
Angus Kong [Thu, 22 Aug 2013 23:13:12 +0000 (16:13 -0700)]
am 10096771: am 15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad

* commit '10096771260244daedac89e70183c54bb577bd0c':
  Fix delete animation in fullscreen mode.

11 years agoam 0d9217b4: am 7e374eb0: Stop the MediaSaveService after unbinding.
Angus Kong [Thu, 22 Aug 2013 23:13:11 +0000 (16:13 -0700)]
am 0d9217b4: am 7e374eb0: Stop the MediaSaveService after unbinding.

* commit '0d9217b4da9dab3b7e70c8df0a600f5601e9fee4':
  Stop the MediaSaveService after unbinding.

11 years agoam ef851bf2: am 025136bb: Support filmstrip swipe in full-screen.
Angus Kong [Thu, 22 Aug 2013 23:13:11 +0000 (16:13 -0700)]
am ef851bf2: am 025136bb: Support filmstrip swipe in full-screen.

* commit 'ef851bf2984c3eba1db92e85f4e908ee56e192f9':
  Support filmstrip swipe in full-screen.

11 years agoam 78ad4a5a: am 87025351: Merge "Update the final PhotoSphere result correctly."...
Angus Kong [Thu, 22 Aug 2013 23:13:11 +0000 (16:13 -0700)]
am 78ad4a5a: am 87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad

* commit '78ad4a5af6f283bf358f75aaeef1231e74eaab12':
  Update the final PhotoSphere result correctly.

11 years agoam de07dbb6: am 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls...
Doris Liu [Thu, 22 Aug 2013 23:13:10 +0000 (16:13 -0700)]
am de07dbb6: am 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad

* commit 'de07dbb65fb35fd36c6e27c417b8fc0c8e4f690f':
  Fix nav bar overlapping camera bottom UI controls

11 years agoam fd791ba4: am b5ca24e7: Merge "Remove the "button" part of the shutter button descr...
Sascha Haeberling [Thu, 22 Aug 2013 23:13:10 +0000 (16:13 -0700)]
am fd791ba4: am b5ca24e7: Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad

* commit 'fd791ba47fdca3f2c625293088c5869b221bfb1c':
  Remove the "button" part of the shutter button description.

11 years agoam 2acc6ac5: am d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos...
Doris Liu [Thu, 22 Aug 2013 23:13:10 +0000 (16:13 -0700)]
am 2acc6ac5: am d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad

* commit '2acc6ac5e0720e484c2f860b1135b2165b1b5d19':
  Fix video snapshot aspect ratio

11 years agoam b8ff43a2: am 2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos...
Doris Liu [Thu, 22 Aug 2013 23:13:09 +0000 (16:13 -0700)]
am b8ff43a2: am 2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad

* commit 'b8ff43a2eef0aca35c685c5c6cbffa807944714c':
  Make camera preview full screen

11 years agoam 00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into...
Sascha Haeberling [Thu, 22 Aug 2013 23:07:31 +0000 (16:07 -0700)]
am 00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad

* commit '00373f8a411042964f019a6355864a4c25fc2238':
  Speed up filmstrip by not decoding with default 3000px.

11 years agoam ce2acbcb: Fix preview thumb orientation
Doris Liu [Thu, 22 Aug 2013 23:07:31 +0000 (16:07 -0700)]
am ce2acbcb: Fix preview thumb orientation

* commit 'ce2acbcb77225b6d429a23e00f69aadde8c2378b':
  Fix preview thumb orientation

11 years agoam f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos...
Angus Kong [Thu, 22 Aug 2013 23:07:29 +0000 (16:07 -0700)]
am f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad

* commit 'f737ac489200f12b6a48c4d0f7b63c0731eb8713':
  Add support to "go-to-next" in film strip.

11 years agoam 56f16746: Merge "Fix video capture animation and video snapshot animation" into...
Doris Liu [Thu, 22 Aug 2013 23:07:28 +0000 (16:07 -0700)]
am 56f16746: Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad

* commit '56f16746c8b3208e12134fb51843dde988cc79bc':
  Fix video capture animation and video snapshot animation

11 years agoam 15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad
Angus Kong [Thu, 22 Aug 2013 23:07:28 +0000 (16:07 -0700)]
am 15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad

* commit '15396ca68c47a4ef14e6b23c6cd009d8915f8ea2':
  Fix delete animation in fullscreen mode.

11 years agoam 7e374eb0: Stop the MediaSaveService after unbinding.
Angus Kong [Thu, 22 Aug 2013 23:07:27 +0000 (16:07 -0700)]
am 7e374eb0: Stop the MediaSaveService after unbinding.

* commit '7e374eb0a450ed2689b556ab42a0a88c8f74df2e':
  Stop the MediaSaveService after unbinding.

11 years agoam 025136bb: Support filmstrip swipe in full-screen.
Angus Kong [Thu, 22 Aug 2013 23:07:27 +0000 (16:07 -0700)]
am 025136bb: Support filmstrip swipe in full-screen.

* commit '025136bb4639d84b2a5a7b95367fabcc92b86415':
  Support filmstrip swipe in full-screen.

11 years agoam 87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos...
Angus Kong [Thu, 22 Aug 2013 23:07:26 +0000 (16:07 -0700)]
am 87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad

* commit '870253516ce315888ac64e1921285e47154a75e7':
  Update the final PhotoSphere result correctly.

11 years agoam 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub...
Doris Liu [Thu, 22 Aug 2013 23:07:25 +0000 (16:07 -0700)]
am 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad

* commit '304a6360c3b710a4a5781788b887ca479646c86f':
  Fix nav bar overlapping camera bottom UI controls

11 years agoam b5ca24e7: Merge "Remove the "button" part of the shutter button description."...
Sascha Haeberling [Thu, 22 Aug 2013 23:07:25 +0000 (16:07 -0700)]
am b5ca24e7: Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad

* commit 'b5ca24e7ce3aa1e3511f0bdf871fd7e41c247027':
  Remove the "button" part of the shutter button description.

11 years agoam d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad
Doris Liu [Thu, 22 Aug 2013 23:07:24 +0000 (16:07 -0700)]
am d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad

* commit 'd7e01e25dab83af2fe093d73f8f5f705f1a27305':
  Fix video snapshot aspect ratio

11 years agoam 2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad
Doris Liu [Thu, 22 Aug 2013 23:07:24 +0000 (16:07 -0700)]
am 2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad

* commit '2b18ecece9ad0affe9054b2818722bf727fcde97':
  Make camera preview full screen

11 years agoam 17525fee: am 5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and...
Jason Noguchi [Thu, 22 Aug 2013 22:51:07 +0000 (15:51 -0700)]
am 17525fee: am 5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad

* commit '17525fee654db267564485339b366356a8c42e91':
  Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps.

11 years agoam 5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflec...
Jason Noguchi [Thu, 22 Aug 2013 22:47:12 +0000 (15:47 -0700)]
am 5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad

* commit '5ad4114f1ad766fa0ec9a9e6469313dd000f426d':
  Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps.

11 years agoMerge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos...
Sascha Haeberling [Thu, 22 Aug 2013 18:06:39 +0000 (18:06 +0000)]
Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad

11 years agoSpeed up filmstrip by not decoding with default 3000px.
Sascha Haeberling [Thu, 22 Aug 2013 01:57:10 +0000 (18:57 -0700)]
Speed up filmstrip by not decoding with default 3000px.

  Bug: 10330214
  Bug: 10430152

We need to tell the wrapped data adapters about the size we need. Also,
use a more efficient way to determine the sample size.

Change-Id: Ie2c6fb438f06d97d6e5420afdceccccf41040020

11 years agoFix preview thumb orientation
Doris Liu [Thu, 22 Aug 2013 01:45:29 +0000 (18:45 -0700)]
Fix preview thumb orientation

Bug: 10428123
Change-Id: I7c6f37db66d9e10a07f555902b214009156736c1

11 years agoMerge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad
Angus Kong [Thu, 22 Aug 2013 01:19:40 +0000 (01:19 +0000)]
Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad

11 years agoAdd support to "go-to-next" in film strip.
Angus Kong [Wed, 21 Aug 2013 22:25:05 +0000 (15:25 -0700)]
Add support to "go-to-next" in film strip.

  bug:10328123

Change-Id: I018876df89cc7ed125a32af850e6b26114fb1004

11 years agoMerge "Fix video capture animation and video snapshot animation" into gb-ub-photos...
Doris Liu [Thu, 22 Aug 2013 01:04:50 +0000 (01:04 +0000)]
Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad

11 years agoFix video capture animation and video snapshot animation
Doris Liu [Wed, 21 Aug 2013 20:42:22 +0000 (13:42 -0700)]
Fix video capture animation and video snapshot animation

Also removed unused effects recording code

Bug: 10326106
Bug: 10414112
Change-Id: I904a26a0b10c75fcce650dc0ec63d7c11746dc2e

11 years agoMerge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad
Angus Kong [Wed, 21 Aug 2013 23:14:36 +0000 (23:14 +0000)]
Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad

11 years agoFix delete animation in fullscreen mode.
Angus Kong [Wed, 21 Aug 2013 18:03:38 +0000 (11:03 -0700)]
Fix delete animation in fullscreen mode.

  bug:10414539

Change-Id: I798492a824306d0eb479aae4e822cd9c7fbe3530

11 years agoStop the MediaSaveService after unbinding.
Angus Kong [Wed, 21 Aug 2013 18:27:35 +0000 (11:27 -0700)]
Stop the MediaSaveService after unbinding.

  bug:10361258

Change-Id: Ie1dc3caac03f7a691aae0c84c468bfb21ce6ae90

11 years agoSupport filmstrip swipe in full-screen.
Angus Kong [Wed, 21 Aug 2013 07:38:05 +0000 (00:38 -0700)]
Support filmstrip swipe in full-screen.

  bug:10341731

Change-Id: Ib4a3278f72d3e1070603d2a094f4021a947bdc56

11 years agoMerge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad
Angus Kong [Wed, 21 Aug 2013 04:32:51 +0000 (04:32 +0000)]
Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad

11 years agoMerge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
Doris Liu [Wed, 21 Aug 2013 00:45:36 +0000 (00:45 +0000)]
Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad

11 years agoMerge "Remove the "button" part of the shutter button description." into gb-ub-photos...
Sascha Haeberling [Wed, 21 Aug 2013 00:43:07 +0000 (00:43 +0000)]
Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad

11 years agoFix nav bar overlapping camera bottom UI controls
Doris Liu [Wed, 21 Aug 2013 00:36:39 +0000 (17:36 -0700)]
Fix nav bar overlapping camera bottom UI controls

Bug: 10394750
Change-Id: Ia46d4903a2c148102bd62ca71516bd81e10fe497

11 years agoMerge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad
Doris Liu [Wed, 21 Aug 2013 00:29:10 +0000 (00:29 +0000)]
Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad

11 years agoRemove the "button" part of the shutter button description.
Sascha Haeberling [Wed, 21 Aug 2013 00:26:37 +0000 (17:26 -0700)]
Remove the "button" part of the shutter button description.

  Bug: 10081355

Talkback automatically appends "button" to a clickable ImageView.

Change-Id: I7d20b96965a5542277cb27b0fd8d255251b2cb3c

11 years agoMerge "Make camera preview full screen" into gb-ub-photos-carlsbad
Doris Liu [Tue, 20 Aug 2013 23:50:08 +0000 (23:50 +0000)]
Merge "Make camera preview full screen" into gb-ub-photos-carlsbad

11 years agoFix video snapshot aspect ratio
Doris Liu [Tue, 20 Aug 2013 23:31:29 +0000 (16:31 -0700)]
Fix video snapshot aspect ratio

Bug: 10312002
Change-Id: Ibe2037195b3936baa63628797ea2b742825ed701

11 years agoMerge "Updating the Camera tests makefile and source to reflect recent split between...
Jason Noguchi [Tue, 20 Aug 2013 23:11:36 +0000 (23:11 +0000)]
Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad

11 years agoUpdating the Camera tests makefile and source to reflect recent split between camera...
Jason Noguchi [Tue, 20 Aug 2013 21:20:35 +0000 (14:20 -0700)]
Updating the Camera tests makefile and source to reflect recent split between camera and gallery
apps.

Change-Id: Ie5b3eb918c67b1f9e77f9a1f53d3cb562d78a001

11 years agoMake camera preview full screen
Doris Liu [Tue, 20 Aug 2013 21:06:50 +0000 (14:06 -0700)]
Make camera preview full screen

Bug: 10328123
Change-Id: I4a72b7d7d35dba7cceecd61db9879265617c511e

11 years agoam d049c85e: am 13ca71eb: Fix squished preview
Doris Liu [Tue, 20 Aug 2013 19:02:29 +0000 (12:02 -0700)]
am d049c85e: am 13ca71eb: Fix squished preview

* commit 'd049c85e69dc388089deca097df3c5e58ce95371':
  Fix squished preview

11 years agoam 13ca71eb: Fix squished preview
Doris Liu [Tue, 20 Aug 2013 18:59:47 +0000 (11:59 -0700)]
am 13ca71eb: Fix squished preview

* commit '13ca71ebdbb2eb9c492da16262311b1290474f7d':
  Fix squished preview