OSDN Git Service

android-x86/packages-apps-Camera2.git
10 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"

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

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

10 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

10 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

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

  Bug: 10494566

Change-Id: I0e5c665867fe324883ff199327df1ef3736cc7c7

10 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

10 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

10 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

10 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

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

10 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

10 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

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

10 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

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

10 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

10 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

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

10 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

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

10 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

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

10 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

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

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

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

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

10 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

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

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 years agoUpdate the final PhotoSphere result correctly.
Angus Kong [Tue, 20 Aug 2013 06:25:48 +0000 (23:25 -0700)]
Update the final PhotoSphere result correctly.

  bug:10400557

Change-Id: I8e8b22b569c3b3a7f4d25e7eb46053332e2dc062

10 years agoFix squished preview
Doris Liu [Tue, 20 Aug 2013 18:14:07 +0000 (11:14 -0700)]
Fix squished preview

Bug: 10330209
Change-Id: I0b208ccd556d8c65474ad6bce0d2ddc3c2bdb7f6

10 years agoam 0819304b: Add "set as" capability in Film Strip
nicolasroard [Tue, 20 Aug 2013 17:25:22 +0000 (10:25 -0700)]
am 0819304b: Add "set as" capability in Film Strip

* commit '0819304bc06ffd3498d9fd0d8a148c50f0903c46':
  Add "set as" capability in Film Strip

10 years agoAdd "set as" capability in Film Strip
nicolasroard [Tue, 20 Aug 2013 16:19:23 +0000 (09:19 -0700)]
Add "set as" capability in Film Strip

bug:10367174
Change-Id: I9161e08f26c02edd1d168ac6986de61066d69552

10 years agoam 722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'.
Sascha Haeberling [Tue, 20 Aug 2013 16:58:05 +0000 (09:58 -0700)]
am 722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'.

* commit '722c86077d15354ccf0d6e1acf5b6384df5da85f':
  Rename accessibility text for Photo Sphere mode from 'new panorama'.

10 years agoRename accessibility text for Photo Sphere mode from 'new panorama'.
Sascha Haeberling [Tue, 20 Aug 2013 02:00:02 +0000 (19:00 -0700)]
Rename accessibility text for Photo Sphere mode from 'new panorama'.

  Bug: 10075811

Change-Id: I7a0e7f890d0243fe13e8f3746d49378daf1bb962

10 years agoam b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad
Angus Kong [Mon, 19 Aug 2013 21:52:48 +0000 (14:52 -0700)]
am b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad

* commit 'b269061daf65d090e6836980b57c408f62039841':
  Implement deletion in the menu.

10 years agoMerge "Implement deletion in the menu." into gb-ub-photos-carlsbad
Angus Kong [Mon, 19 Aug 2013 21:50:23 +0000 (21:50 +0000)]
Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad

10 years agoImplement deletion in the menu.
Angus Kong [Mon, 19 Aug 2013 21:46:20 +0000 (14:46 -0700)]
Implement deletion in the menu.

  bug:10367402

Change-Id: Ia48544ccb4186808f8cf89c7b4ea6d291aa8cf24

10 years agoam b0a5929b: Add video details to the details menu
Sascha Haeberling [Mon, 19 Aug 2013 21:37:40 +0000 (14:37 -0700)]
am b0a5929b: Add video details to the details menu

* commit 'b0a5929b1dd0ddc2729e23ba95afdb43a1aecfd5':
  Add video details to the details menu

10 years agoAdd video details to the details menu
Sascha Haeberling [Mon, 19 Aug 2013 21:02:19 +0000 (14:02 -0700)]
Add video details to the details menu

  Bug: 10330505

Also fix a potential NPE issue and some minor reformatting.

Change-Id: I89a32645a497d1f19d935b96bd1997e6fdf902b2

10 years agoam 99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos...
ztenghui [Mon, 19 Aug 2013 20:23:10 +0000 (13:23 -0700)]
am 99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad

* commit '99a5ef6f6158d0056c90135329da4af0dc8ca7f4':
  Update the action bar style to match Bryce

10 years agoMerge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad
ztenghui [Mon, 19 Aug 2013 20:21:26 +0000 (20:21 +0000)]
Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad

10 years agoUpdate the action bar style to match Bryce
ztenghui [Mon, 19 Aug 2013 18:54:12 +0000 (11:54 -0700)]
Update the action bar style to match Bryce

bug:10347330

Change-Id: I9a3e6f5cac0003cce4b19cba28904d539faa94a9

10 years agoam e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug...
Sascha Haeberling [Mon, 19 Aug 2013 18:49:38 +0000 (11:49 -0700)]
am e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad

* commit 'e98a59afc89fc97bc619ef8c3aa66781061592f8':
  Don't refresh item on resume as it leads to a filmstrip bug.

10 years agoMerge "Don't refresh item on resume as it leads to a filmstrip bug." into gb-ub-photo...
Sascha Haeberling [Mon, 19 Aug 2013 18:47:10 +0000 (18:47 +0000)]
Merge "Don't refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad

10 years agoam 58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 19 Aug 2013 18:46:19 +0000 (11:46 -0700)]
am 58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad

* commit '58dfa0fb61e0499fdb108143da90014c463f05a2':
  Enable switching cameras in video mode.

10 years agoDon't refresh item on resume as it leads to a filmstrip bug.
Sascha Haeberling [Mon, 19 Aug 2013 18:45:44 +0000 (11:45 -0700)]
Don't refresh item on resume as it leads to a filmstrip bug.

Instead we should listen to the proper events when something is changed
with the media.

Change-Id: Ia5337a4a83de73962070148e0a10f0a12f769345

10 years agoam 88ef7664: Bring back the bottom controls in Filmstrip.
Sascha Haeberling [Mon, 19 Aug 2013 18:43:11 +0000 (11:43 -0700)]
am 88ef7664: Bring back the bottom controls in Filmstrip.

* commit '88ef7664ba6a888fa5da8693091674e152b56192':
  Bring back the bottom controls in Filmstrip.

10 years agoMerge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 19 Aug 2013 18:43:06 +0000 (18:43 +0000)]
Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad

10 years agoBring back the bottom controls in Filmstrip.
Sascha Haeberling [Fri, 16 Aug 2013 00:19:22 +0000 (17:19 -0700)]
Bring back the bottom controls in Filmstrip.

  Bug: 10367172
  Bug: 10074320

Also hooks up the Edit button and the edit menu item.

Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c

10 years agoEnable switching cameras in video mode.
Sascha Haeberling [Mon, 19 Aug 2013 18:29:04 +0000 (11:29 -0700)]
Enable switching cameras in video mode.

  Bug: 10313018

Change-Id: I8e75341d7d37135ba7747d56a1a0e6d19ffb8eaa

10 years agoam 1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub...
ztenghui [Mon, 19 Aug 2013 16:52:39 +0000 (09:52 -0700)]
am 1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad

* commit '1571239c21fc4be7fd3c8db6ff1b8dc22f4d7e6f':
  Add the trim functionality back to FilmStripView

10 years agoMerge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad
ztenghui [Mon, 19 Aug 2013 16:50:34 +0000 (16:50 +0000)]
Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad

10 years agoam e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad
Doris Liu [Sat, 17 Aug 2013 01:01:53 +0000 (18:01 -0700)]
am e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad

* commit 'e9d3428f605ef90efbf94c18abf5bba3ac64d870':
  Add image 1:1 support

10 years agoMerge "Add image 1:1 support" into gb-ub-photos-carlsbad
Doris Liu [Sat, 17 Aug 2013 00:59:26 +0000 (00:59 +0000)]
Merge "Add image 1:1 support" into gb-ub-photos-carlsbad

10 years agoAdd image 1:1 support
Doris Liu [Fri, 16 Aug 2013 00:34:41 +0000 (17:34 -0700)]
Add image 1:1 support

Bug: 10308195
Change-Id: I7b7fcf3b46475a2d39bac27095d01d438582e516

10 years agoAdd the trim functionality back to FilmStripView
ztenghui [Fri, 16 Aug 2013 23:21:22 +0000 (16:21 -0700)]
Add the trim functionality back to FilmStripView

At the same time, disable the mute for now.

bug:10313015

Change-Id: Ic2139f509ddb4ed57f3a4d67782eadb150e88ea5

10 years agoam 856d7ec4: Merge "Add back intent-filter for default category and main action....
Mangesh Ghiware [Fri, 16 Aug 2013 23:55:22 +0000 (16:55 -0700)]
am 856d7ec4: Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad

* commit '856d7ec4eac95a9411970228795945f0dae66af5':
  Add back intent-filter for default category and main action.

10 years agoMerge "Add back intent-filter for default category and main action." into gb-ub-photo...
Mangesh Ghiware [Fri, 16 Aug 2013 23:54:06 +0000 (23:54 +0000)]
Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad

10 years agoAdd back intent-filter for default category and main action.
Mangesh Ghiware [Fri, 16 Aug 2013 23:49:32 +0000 (16:49 -0700)]
Add back intent-filter for default category and main action.

Bug: 10349073
Change-Id: I06c24cebc50fe555ec150813117955da09814fb4

10 years agoam 4ff5a1ab: Set views in filmstrip invisible when alpha = 0.
Angus Kong [Fri, 16 Aug 2013 00:01:09 +0000 (17:01 -0700)]
am 4ff5a1ab: Set views in filmstrip invisible when alpha = 0.

* commit '4ff5a1ab360577c6a7ec953f9197778c84c9d334':
  Set views in filmstrip invisible when alpha = 0.

10 years agoSet views in filmstrip invisible when alpha = 0.
Angus Kong [Wed, 14 Aug 2013 23:07:54 +0000 (16:07 -0700)]
Set views in filmstrip invisible when alpha = 0.

  bug:10096747

Change-Id: Idcb62448acbf38d581af3a08a9bcbc0cad0ab6be

10 years agoam 394023fb: Single-tap in fullscreen view toggles ActionBar.
Sascha Haeberling [Thu, 15 Aug 2013 23:07:58 +0000 (16:07 -0700)]
am 394023fb: Single-tap in fullscreen view toggles ActionBar.

* commit '394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7':
  Single-tap in fullscreen view toggles ActionBar.

10 years agoSingle-tap in fullscreen view toggles ActionBar.
Sascha Haeberling [Thu, 15 Aug 2013 22:57:29 +0000 (15:57 -0700)]
Single-tap in fullscreen view toggles ActionBar.

  Bug: 10347286

Change-Id: I55e400c957d4ec1ef1307e45007e2127ea5ab7ea

10 years agoam fae11a16: Implent show-on-map functionality. Also make sure the show-on-map item...
Sascha Haeberling [Thu, 15 Aug 2013 22:32:22 +0000 (15:32 -0700)]
am fae11a16: Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.

* commit 'fae11a165e344a38811770c7d348eda214683edc':
  Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.