OSDN Git Service
Doris Liu [Tue, 11 Feb 2014 18:55:10 +0000 (10:55 -0800)]
Move photosphere icon assets to protected res dir
Bug:
12963334
Change-Id: I6b55564971e0db0fab7eed53ca033b4602acb8ed
Sascha Haeberling [Tue, 11 Feb 2014 00:46:37 +0000 (00:46 +0000)]
Merge "New Settings UI and video quality selection logic." into gb-ub-photos-denali
Sascha Haeberling [Fri, 7 Feb 2014 01:30:53 +0000 (02:30 +0100)]
New Settings UI and video quality selection logic.
Bug:
12467965
Bug:
12935910
Bug:
12575084
Implements the settings as a proper activity/fragment. Also cleans
up some of the old logic we had for handling and displaying settings.
Also has the new L/M/S logic for video quality.
Change-Id: I412af424b74369cef15c7ead2cb09704875972e3
Doris Liu [Tue, 11 Feb 2014 00:39:31 +0000 (00:39 +0000)]
Merge "Mode switcher refinements." into gb-ub-photos-denali
Angus Kong [Mon, 10 Feb 2014 23:49:50 +0000 (23:49 +0000)]
Merge "Change capture animation to simple flash" into gb-ub-photos-denali
Angus Kong [Mon, 10 Feb 2014 22:54:29 +0000 (14:54 -0800)]
Change capture animation to simple flash
bug:
12959370
Change-Id: I7ea7c9da2642a348d1cb6b802fe64048720ebee8
Doris Liu [Mon, 10 Feb 2014 22:42:08 +0000 (14:42 -0800)]
Mode switcher refinements.
- Increase the mode switch icon size.
- Change mode cover color to 0x191919
- Change the font of mode text to roboto medium
- Change the highlight state of mode icon to fill
Bug:
12954273
Bug:
12954790
Bug:
12954370
Bug:
12953261
Change-Id: I23ef62ae4ce5589da20c7ee6bf805e5af70b62f2
Spike Sprague [Mon, 10 Feb 2014 22:31:00 +0000 (22:31 +0000)]
Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
Spike Sprague [Mon, 10 Feb 2014 20:11:20 +0000 (12:11 -0800)]
fixing intent ui controls visibility
bug:
12668877
Change-Id: Ibffc0682fb37f88998d2afddcf52bcd6ef86192f
Erin Dahlgren [Mon, 10 Feb 2014 20:38:37 +0000 (12:38 -0800)]
Separate capture icons into a protected res dir.
Bug:
12954169
Change-Id: I0ecd4c69fb15308e463047cac16213cbfe125973
Angus Kong [Mon, 10 Feb 2014 20:14:59 +0000 (20:14 +0000)]
Merge "De-overlap of undo bar and filmstrip controls." into gb-ub-photos-denali
Angus Kong [Mon, 10 Feb 2014 19:37:29 +0000 (11:37 -0800)]
De-overlap of undo bar and filmstrip controls.
bug:
12958725
Change-Id: Iaaf31ae02e9f1975b8c3ec20fea2b6da36208278
Spike Sprague [Mon, 10 Feb 2014 19:10:19 +0000 (19:10 +0000)]
Merge "video stop button diameter increased" into gb-ub-photos-denali
Spike Sprague [Mon, 10 Feb 2014 18:54:54 +0000 (10:54 -0800)]
video stop button diameter increased
bug:
12954412
Change-Id: I7b2cd286fbd0871fdaec185090c304edcb582c1e
Doris Liu [Wed, 5 Feb 2014 00:57:55 +0000 (16:57 -0800)]
New mode drawer.
-Changed the entire look of the mode drawer by using a live preview
as background, and use circle icons rather than block shaped icons
-Fade in the blurred preview frame during mode switch
-Add highlighted and selected states to mode icons
-Center the mode drawer in preview rather than whole screen
-Swapped mode order in the drawer
TODO:
-Add settings access point
-Refine swipe in/out behavior of the drawer
Change-Id: Ibab0fe960bcfbb9635ca7f45d50178cb1ef2941f
Erin Dahlgren [Sat, 8 Feb 2014 01:37:21 +0000 (01:37 +0000)]
Merge "Ensure that mode options and indicators are fixed size." into gb-ub-photos-denali
Erin Dahlgren [Sat, 8 Feb 2014 01:36:35 +0000 (01:36 +0000)]
Merge "Add grid lines option and indicator." into gb-ub-photos-denali
Spike Sprague [Sat, 8 Feb 2014 01:33:59 +0000 (01:33 +0000)]
Merge "size bottom bar width to match preview area" into gb-ub-photos-denali
Erin Dahlgren [Fri, 7 Feb 2014 20:38:57 +0000 (12:38 -0800)]
Add grid lines option and indicator.
Bug:
12454164
Change-Id: Iae088cee0cc67041bb304f276a5ffe84a813df5e
Erin Dahlgren [Mon, 3 Feb 2014 18:12:27 +0000 (10:12 -0800)]
Shared texture view in photosphere.
Change-Id: I8dd4898e3800b02fa7f0488104dcfa4600b3845f
Spike Sprague [Sat, 8 Feb 2014 00:01:48 +0000 (16:01 -0800)]
size bottom bar width to match preview area
bug:
12563756
Change-Id: If6d26aa050ab130a177a6c2c21e38ee11cb985b5
Erin Dahlgren [Fri, 7 Feb 2014 22:11:36 +0000 (14:11 -0800)]
Ensure that mode options and indicators are fixed size.
Change-Id: I487cefaaffe8d2adb2f078692a7a0af16e48dfa3
Angus Kong [Fri, 7 Feb 2014 19:20:00 +0000 (11:20 -0800)]
Move onPreviewAreaSizeChanged() out of layout pass
Change-Id: I4eb6f6ffda1438fca7575328ce09945d40549d51
Andy Huibers [Fri, 7 Feb 2014 18:10:16 +0000 (10:10 -0800)]
Scale high aspect ratio Bitmaps to use full texture size.
Bug:
11137777
Change-Id: I1a7ae213d3cdc199d381b89b610c5a195e30fbe9
Erin Dahlgren [Wed, 5 Feb 2014 22:53:06 +0000 (14:53 -0800)]
Fix an IllegalStateException introduced by ag/413832.
Change-Id: Ib160c313af4e60215a9a91b93a2ec2506a06c5d2
Erin Dahlgren [Wed, 5 Feb 2014 22:44:25 +0000 (22:44 +0000)]
Merge "Treat mode toggle as indicators or default toggle view." into gb-ub-photos-denali
Erin Dahlgren [Mon, 3 Feb 2014 23:55:31 +0000 (15:55 -0800)]
Treat mode toggle as indicators or default toggle view.
Change-Id: I25a97cea27893ab76a8930c99de8e65eb2904b36
Geoff Mendal [Wed, 5 Feb 2014 22:42:13 +0000 (22:42 +0000)]
Merge "Revert "Revert "Import translations. DO NOT MERGE""" into gb-ub-photos-denali
Geoff Mendal [Wed, 5 Feb 2014 22:42:08 +0000 (22:42 +0000)]
Revert "Revert "Import translations. DO NOT MERGE""
This reverts commit
f8919f0be4f94288edac60f9ab65768f335ab847.
Change-Id: Ibbb702ec82939254d88aba30e58ffc12b0411bbc
Geoff Mendal [Wed, 5 Feb 2014 22:26:40 +0000 (22:26 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into gb-ub-photos-denali
Geoff Mendal [Wed, 5 Feb 2014 22:26:34 +0000 (22:26 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
c31dc66e88992d92decf8c2121cb99c481fec3f0.
Change-Id: I0f938daddcb866947a5015b91cbd8cb650e0bf18
Geoff Mendal [Wed, 5 Feb 2014 22:05:50 +0000 (22:05 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Geoff Mendal [Wed, 5 Feb 2014 21:53:40 +0000 (13:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0720f3157996a287c66f6fc730fb8b3666d32e3c
Auto-generated-cl: translation import
Sascha Haeberling [Wed, 5 Feb 2014 21:36:56 +0000 (21:36 +0000)]
Merge "Prevent crash if first-time location dialog." into gb-ub-photos-denali
Sascha Haeberling [Wed, 5 Feb 2014 21:06:27 +0000 (22:06 +0100)]
Prevent crash if first-time location dialog.
Change-Id: I34f44220202f7b7b39facf7caf9cd46e6e44acc4
Sascha Haeberling [Wed, 5 Feb 2014 21:03:22 +0000 (21:03 +0000)]
Merge "Properly guard the weak reference." into gb-ub-photos-denali
Sascha Haeberling [Wed, 5 Feb 2014 20:48:55 +0000 (21:48 +0100)]
Properly guard the weak reference.
Bug:
12805279
Change-Id: I268b121807d10edaba5d627eb3fc2d2ffc6579d3
Erin Dahlgren [Wed, 5 Feb 2014 19:05:21 +0000 (11:05 -0800)]
Update new Camera2 indicator assets.
Bug:
12893552
Change-Id: I9d8133291626563d0e044f9735592b591671332c
Erin Dahlgren [Mon, 3 Feb 2014 21:24:55 +0000 (13:24 -0800)]
Elevate refocus to its own mode, merge craft and camera.
Change-Id: I9686db26993319fdaf09f09c0610bb65e00a0e05
Sascha Haeberling [Tue, 4 Feb 2014 11:48:55 +0000 (12:48 +0100)]
Avoid activity leaks.
Bug:
12805279
Change-Id: Ib91ff2d286f6a0e0d67dad673e7af24600e15759
Erin Dahlgren [Wed, 5 Feb 2014 01:07:53 +0000 (01:07 +0000)]
Merge "Add support for grid lines overlay." into gb-ub-photos-denali
Erin Dahlgren [Tue, 4 Feb 2014 23:23:30 +0000 (15:23 -0800)]
Add support for grid lines overlay.
Bug:
12454164
Change-Id: Iecf175e6dd41d8c2ce42c177f5bc91ec997c420b
Spike Sprague [Tue, 4 Feb 2014 22:19:41 +0000 (14:19 -0800)]
add a11y string for "more options" ellipsis
bug:
10745077
Change-Id: I50c68fc295d2b07eb8a923bfde3e97b7496d2f4d
Andy Huibers [Tue, 4 Feb 2014 20:54:27 +0000 (20:54 +0000)]
Merge "Make sure video quality requested is valid." into gb-ub-photos-denali
Alan Newberger [Tue, 4 Feb 2014 19:00:44 +0000 (19:00 +0000)]
Merge "add a11y announcement when multi toggle button changes" into gb-ub-photos-denali
Alan Newberger [Tue, 4 Feb 2014 17:15:47 +0000 (09:15 -0800)]
add a11y announcement when multi toggle button changes
addressing TODO with a manual announcement whenever the content
description of a button changes. Does checking of existing content
description to reduce chattiness when options are set by the system
e.g. on a resolution or orientation change. Still a bit of chattiness
on startup if the app is setting a button to a nonstandard value, but
I think its acceptable, it's giving user useful information about
nonstandard options on startup.
Bug:
10745077
Change-Id: I81089b2f4f7f14b90c4436199895a0f67075c3d3
Erin Dahlgren [Tue, 4 Feb 2014 17:02:40 +0000 (17:02 +0000)]
Merge "Set bottom bar to a consistent color across app." into gb-ub-photos-denali
Erin Dahlgren [Tue, 4 Feb 2014 17:00:15 +0000 (17:00 +0000)]
Merge "Center mode options according to spec." into gb-ub-photos-denali
Andy Huibers [Tue, 4 Feb 2014 16:03:35 +0000 (08:03 -0800)]
Make sure video quality requested is valid.
Bug:
12824921
Change-Id: I653ad18359417844846b792d8ffa3b697e03f07e
Geoff Mendal [Tue, 4 Feb 2014 02:31:34 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Alan Newberger [Tue, 4 Feb 2014 01:44:13 +0000 (01:44 +0000)]
Merge "add content descriptions for filmstrip controls" into gb-ub-photos-denali
Alan Newberger [Tue, 4 Feb 2014 01:23:50 +0000 (17:23 -0800)]
add content descriptions for filmstrip controls
adding TalkBack descriptions for action buttons shown on the bottom of filmstrip.
Bug:
10745077
Change-Id: I3ea278fb065629b43f0ccc9821fe19e6f1d9c4f9
Geoff Mendal [Tue, 4 Feb 2014 00:25:46 +0000 (16:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: If14d9ca0e2b4050c41fdd5c842cb0bed0d560be0
Auto-generated-cl: translation import
Alan Newberger [Mon, 3 Feb 2014 23:03:26 +0000 (15:03 -0800)]
Add content URI for current filmstrip item to Gallery intent
when starting Gallery, if there is a current filmstrip ID, retrieve
its content URI and pass to the GalleryHelper to process it. Do nothing
within the GalleryHelper at this time.
Bug:
12587688
Change-Id: I5becbfa7d12e739383b9f2ef3d3dba7460fa3d25
Erin Dahlgren [Mon, 3 Feb 2014 22:39:53 +0000 (14:39 -0800)]
Center mode options according to spec.
* spec: https://drive.google.com/a/google.com/#folders/0B0GnUi_SFKJtdHp4YnBnLTZxcjQ
* for modes like video with less than the total possible
mode options, center the options.
Change-Id: I79dce62ced916d2ed20d04e805abe2bfdd60c779
Erin Dahlgren [Mon, 3 Feb 2014 22:08:20 +0000 (14:08 -0800)]
Fix the build by adding eventproto foreground stubs.
Change-Id: I6319378499e105c5638d8ef4788fbc21ed073936
Erin Dahlgren [Mon, 3 Feb 2014 22:01:54 +0000 (14:01 -0800)]
Set bottom bar to a consistent color across app.
Change-Id: Ieda492a9dbc122a828d8b5d8df831fbe99e6295f
Erin Dahlgren [Fri, 31 Jan 2014 19:13:33 +0000 (11:13 -0800)]
Correctly log the source of a foreground event.
Bug:
12589465
Change-Id: Ib26d44e1a8fdc4e03561c6a00886682881106ec2
Erin Dahlgren [Thu, 30 Jan 2014 22:11:20 +0000 (14:11 -0800)]
Move mode options to transparent overlay.
Change-Id: Iec0423668c58a5b849841afc45def923210df6fd
Spike Sprague [Fri, 31 Jan 2014 22:47:58 +0000 (22:47 +0000)]
Merge "adding accessibilty strings to ui items" into gb-ub-photos-denali
Doris Liu [Fri, 31 Jan 2014 20:03:29 +0000 (20:03 +0000)]
Merge "First pass on tracking camera performance" into gb-ub-photos-denali
Doris Liu [Thu, 30 Jan 2014 20:29:27 +0000 (12:29 -0800)]
First pass on tracking camera performance
Record time spent on cold/warm start, mode switching for later
hooking up with instrument tests.
Bug:
12838163
Change-Id: I1004f2b26d9ff9d59b4729e7323c079a6b561fdc
Erin Dahlgren [Fri, 31 Jan 2014 18:21:19 +0000 (18:21 +0000)]
Merge "Log swipes out of filmstrip." into gb-ub-photos-denali
Sascha Haeberling [Fri, 31 Jan 2014 17:48:00 +0000 (17:48 +0000)]
Merge "Move tiny planet editor into the edit action." into gb-ub-photos-denali
Sascha Haeberling [Fri, 31 Jan 2014 16:56:15 +0000 (17:56 +0100)]
Prevent Tiny Planet from crashing often.
Bug:
11050122
Make sure the preview rendering is always happening on the
handler thread.
Change-Id: Id5a2e5d939fa6bd3520dc8bfa5bb1803ef6fb1c5
Sascha Haeberling [Fri, 31 Jan 2014 14:21:02 +0000 (15:21 +0100)]
Move tiny planet editor into the edit action.
Bug:
12553864
Change-Id: I3431565928bef637c11246fc6e711ef3d1f925ce
Erin Dahlgren [Thu, 30 Jan 2014 02:13:34 +0000 (18:13 -0800)]
Log swipes out of filmstrip.
Bug:
12589465
Change-Id: I13b20b3e56b1ae4285ecc00ca4c2fb5a42fa75ed
Erin Dahlgren [Thu, 30 Jan 2014 23:05:29 +0000 (23:05 +0000)]
Merge "Add logging for swipe to filmstrip from camera." into gb-ub-photos-denali
Erin Dahlgren [Thu, 30 Jan 2014 01:29:18 +0000 (17:29 -0800)]
Add logging for swipe to filmstrip from camera.
Bug:
12589465
Change-Id: Ia57c1f341d7c9262b96823121e046fe4c4378b5c
Erin Dahlgren [Wed, 29 Jan 2014 23:44:57 +0000 (15:44 -0800)]
Don't add duplicate identical OnSettingChangedListeners.
Bug:
12802314
Change-Id: I8baa668205633a9f5c9da259f0fa28dbca951a77
Doris Liu [Thu, 30 Jan 2014 21:31:46 +0000 (21:31 +0000)]
Merge "Fix NPE" into gb-ub-photos-denali
Sascha Haeberling [Thu, 30 Jan 2014 21:21:01 +0000 (21:21 +0000)]
Merge "Changes the picture size settings to L,M,S from concrete resolutions." into gb-ub-photos-denali
Doris Liu [Thu, 30 Jan 2014 21:11:29 +0000 (13:11 -0800)]
Fix NPE
This NPE is caused by not having a PreviewStatusListener in
photosphere module. Hooking up PreviewStatusListener in
photosphere requires a refactor which is non-trivial amount
of work.
So for now, a null check is added here to prevent NPE
and the logic of detecting and handling device flip will be
added into photosphere to properly handle device flp.
Part II at ag/412607
Bug:
12679997
Change-Id: I5392674e387800e6a2a3114ec3f834b439aed31e
Sascha Haeberling [Wed, 29 Jan 2014 19:54:39 +0000 (20:54 +0100)]
Changes the picture size settings to L,M,S from concrete resolutions.
Bug:
12575084
Bug:
12717251
The strategy in detail:
- Sort all available sizes
- For 'large', select the resolution with the most pixels.
- Use the 'large' resolution aspect ratio as the target AR.
- Create a list of resolutions with AR close to 'large'.
- If only two more are available, use them for medium and small.
- If less are available, boarden the search in complete list.
- Again, if only two more are available, use them for medium and small.
- Otherwise find medium resolution with total pixels closest to 50% of 'large' and ...
small as 25% of 'large' pixels.
- If they both come out the same, select either one small for 'small' or one larger
for 'medium'.
Change-Id: Ib94fdf0ce987968bccd85abbf5be7bdaa914325f
Alan Newberger [Thu, 30 Jan 2014 17:33:03 +0000 (17:33 +0000)]
Merge "add additional lifecycle states to PanoramaViewHelper" into gb-ub-photos-denali
Alan Newberger [Wed, 29 Jan 2014 02:09:30 +0000 (18:09 -0800)]
add additional lifecycle states to PanoramaViewHelper
Bug:
12192549
Change-Id: I36668db7657c8b285419e7eca824b3d6e495e5ef
Spike Sprague [Wed, 29 Jan 2014 02:48:22 +0000 (18:48 -0800)]
adding accessibilty strings to ui items
Change-Id: I3f2356c765bd2799dfa1009ff6707fc3af87383e
Doris Liu [Wed, 29 Jan 2014 07:31:58 +0000 (07:31 +0000)]
Merge "Use mutable drawable to avoid sharing drawable states" into gb-ub-photos-denali
Doris Liu [Wed, 29 Jan 2014 02:22:51 +0000 (18:22 -0800)]
Use mutable drawable to avoid sharing drawable states
Bug:
12594617
Change-Id: I798b67ed42a5593c346643d42ebf1143d54551e6
Erin Dahlgren [Wed, 29 Jan 2014 01:49:27 +0000 (01:49 +0000)]
Merge "Fix secure camera launch crash." into gb-ub-photos-denali
Erin Dahlgren [Wed, 29 Jan 2014 01:40:28 +0000 (17:40 -0800)]
Fix secure camera launch crash.
Bug:
12783858
Change-Id: Iff5cfecff986966f63b40d2db4bc1d31037f12d4
Doris Liu [Wed, 29 Jan 2014 01:19:50 +0000 (01:19 +0000)]
Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali
Doris Liu [Sat, 18 Jan 2014 01:21:42 +0000 (17:21 -0800)]
Fix mode transition jank and stretched video preview
Bug:
11963674
Change-Id: I9cb292aa3dea6b0073dfc19af8105dce1f0c9865
Seth Raphael [Tue, 28 Jan 2014 22:14:24 +0000 (22:14 +0000)]
Merge "Clearcut Logs" into gb-ub-photos-denali
Seth Raphael [Wed, 18 Dec 2013 21:45:03 +0000 (13:45 -0800)]
Clearcut Logs
Change-Id: I564a2452cb7f02f899760ac086e56eaa76b174eb
Spike Sprague [Sat, 25 Jan 2014 02:08:33 +0000 (02:08 +0000)]
Merge "reset capture button state on swipes" into gb-ub-photos-denali
Spike Sprague [Fri, 24 Jan 2014 23:41:28 +0000 (15:41 -0800)]
reset capture button state on swipes
bug:
12550678
Change-Id: I9678e55cdd19ca319686665b69e76a9984fa7a6a
Spike Sprague [Sat, 25 Jan 2014 00:59:25 +0000 (16:59 -0800)]
restore video bottom bar on app background during video capture
bug:
12726013
Change-Id: I3e69daad21835e7ce46427398531d0236703cb5a
Doris Liu [Fri, 24 Jan 2014 22:11:50 +0000 (14:11 -0800)]
Fix NPE by adding a onPause check
Bug:
12682478
Change-Id: Ida9c79287751089449569ec26dcf1c1f195afde9
Sascha Haeberling [Fri, 24 Jan 2014 02:28:57 +0000 (02:28 +0000)]
Merge "Adds an API for temporary session storage." into gb-ub-photos-denali
Sascha Haeberling [Thu, 23 Jan 2014 02:45:43 +0000 (18:45 -0800)]
Adds an API for temporary session storage.
Bug:
12064183
This is required so that we can have all modules that have sessions
use the same logic for creating and deleting them.
Change-Id: I20591310d6b4534e564ab60608049eec87f823f9
Erin Dahlgren [Thu, 23 Jan 2014 19:13:30 +0000 (19:13 +0000)]
Merge "Use ninepatch for indicator background." into gb-ub-photos-denali
Baligh Uddin [Thu, 23 Jan 2014 18:15:09 +0000 (10:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I81642c60b0380b70e6d0556ae47f0421853ddee4
Auto-generated-cl: translation import
Erin Dahlgren [Thu, 23 Jan 2014 02:14:21 +0000 (18:14 -0800)]
Use ninepatch for indicator background.
Bug:
12602711
Change-Id: Id513f526331b4dbefcfae1f2bff548cbf4bbac94
Sascha Haeberling [Wed, 22 Jan 2014 22:16:25 +0000 (22:16 +0000)]
Merge "Move focus overlay into generic_module." into gb-ub-photos-denali
Sascha Haeberling [Sat, 18 Jan 2014 03:03:52 +0000 (19:03 -0800)]
Move focus overlay into generic_module.
Bug:
12563457
Also cleans up the focus overlay API.
Change-Id: I8a63b7abf7cc9390cc709c275807b1d3d2e344a6
Erin Dahlgren [Wed, 22 Jan 2014 19:49:33 +0000 (11:49 -0800)]
Switch to gcam module only if gcam is supported.
Bug:
12682385
Bug:
12594403
Change-Id: I86b8156ea5027818135ccfce03a1d23f377055f2
Erin Dahlgren [Wed, 22 Jan 2014 17:43:29 +0000 (09:43 -0800)]
Fix the build: limit hdr icons.
Change-Id: I64772bc1cae76487e2d13b3a7f5f666b99a66124
Erin Dahlgren [Wed, 22 Jan 2014 17:26:09 +0000 (17:26 +0000)]
Merge "Add hdr option and indicator" into gb-ub-photos-denali
Erin Dahlgren [Wed, 22 Jan 2014 00:32:43 +0000 (00:32 +0000)]
Merge "Fix the build: use exported panorama values in helper class." into gb-ub-photos-denali