OSDN Git Service
Spike Sprague [Thu, 16 Jan 2014 22:09:13 +0000 (22:09 +0000)]
Merge "button background press states" into gb-ub-photos-denali
Sascha Haeberling [Thu, 16 Jan 2014 21:56:36 +0000 (21:56 +0000)]
Merge "Add 10MP Moto X resolution." into gb-ub-photos-denali
Sascha Haeberling [Thu, 16 Jan 2014 21:11:46 +0000 (13:11 -0800)]
Add 10MP Moto X resolution.
Bug:
12586353
Change-Id: Ie29227df3dbaca1eed52ced222c8d1868710aa9d
Angus Kong [Thu, 16 Jan 2014 19:58:44 +0000 (19:58 +0000)]
Merge "Change refocus icon asset." into gb-ub-photos-denali
Angus Kong [Thu, 16 Jan 2014 19:06:46 +0000 (11:06 -0800)]
Change refocus icon asset.
bug:
12550183
Change-Id: Iad54468a1f88bcc23e68ebda39931c93c5ee407d
Spike Sprague [Wed, 15 Jan 2014 18:11:54 +0000 (10:11 -0800)]
button background press states
bug:
12450227
Change-Id: I9008a4d57545bd081a4c6539c64d23b939d4ab95
Doris Liu [Thu, 16 Jan 2014 03:55:57 +0000 (03:55 +0000)]
Merge "Fix focus indicator slightly off center during CAF" into gb-ub-photos-denali
Doris Liu [Thu, 16 Jan 2014 03:50:40 +0000 (03:50 +0000)]
Merge "Add quick switch support for advanced camera" into gb-ub-photos-denali
Doris Liu [Thu, 16 Jan 2014 03:29:34 +0000 (19:29 -0800)]
Fix focus indicator slightly off center during CAF
Change-Id: I5eaf14682e81d95f738a356985eb8d40bdc54524
Doris Liu [Thu, 16 Jan 2014 03:17:38 +0000 (19:17 -0800)]
Add quick switch support for advanced camera
Bug:
12429444
Change-Id: I62d5a5b3ce2b8d0ca8d19c8f3a35363114815b20
Sascha Haeberling [Thu, 16 Jan 2014 02:23:55 +0000 (02:23 +0000)]
Merge "Disables swipe during video recording and during photo sphere sessions." into gb-ub-photos-denali
Angus Kong [Thu, 16 Jan 2014 00:55:38 +0000 (00:55 +0000)]
Merge "Make up affordance dependent on installed packages" into gb-ub-photos-denali
Angus Kong [Wed, 15 Jan 2014 22:40:27 +0000 (14:40 -0800)]
Make up affordance dependent on installed packages
bug:
12549744
Change-Id: I3b39ccb45518f1044c2149bd5b8c633a6899d96c
Sascha Haeberling [Thu, 16 Jan 2014 00:33:59 +0000 (16:33 -0800)]
Disables swipe during video recording and during photo sphere sessions.
Bug:
12554964
Change-Id: I2ab1ae34ae6964371680418eac3583b2e766b26c
Spike Sprague [Wed, 15 Jan 2014 23:55:35 +0000 (23:55 +0000)]
Merge "adjusted capture button highlight as per comments in b/
12560596" into gb-ub-photos-denali
Spike Sprague [Wed, 15 Jan 2014 23:10:07 +0000 (15:10 -0800)]
adjusted capture button highlight as per comments in b/
12560596
Change-Id: I9326121e8836898035ecfc6254467567f7b4c431
Spike Sprague [Wed, 15 Jan 2014 23:14:31 +0000 (23:14 +0000)]
Merge "snappier video bottom bar animation" into gb-ub-photos-denali
Doris Liu [Wed, 15 Jan 2014 21:56:56 +0000 (21:56 +0000)]
Merge "Open mode draw at a constant speed when there's a fast fling" into gb-ub-photos-denali
Doris Liu [Wed, 15 Jan 2014 20:26:17 +0000 (12:26 -0800)]
Open mode draw at a constant speed when there's a fast fling
Bug:
12544207
Change-Id: I104d81c0a74bb46f38ff8cd61dd9f13a2d615ed7
Erin Dahlgren [Wed, 15 Jan 2014 21:11:04 +0000 (13:11 -0800)]
Remove conflicting refocus pngs.
Bug:
12567150
Change-Id: I56f6639cab5933e5e672572d4cd5a84042893f54
Spike Sprague [Wed, 15 Jan 2014 20:15:03 +0000 (12:15 -0800)]
snappier video bottom bar animation
bug:
12568407
Change-Id: I827b5d6c0e39ad704bd0b8aef1a8feaad7d6614f
Angus Kong [Wed, 15 Jan 2014 18:57:37 +0000 (18:57 +0000)]
Merge "Fix size of filmstrip bottom controls sizes." into gb-ub-photos-denali
Erin Dahlgren [Wed, 15 Jan 2014 18:39:48 +0000 (18:39 +0000)]
Merge "On screen indicators in top right in landscape." into gb-ub-photos-denali
Spike Sprague [Wed, 15 Jan 2014 18:21:41 +0000 (10:21 -0800)]
refine capture button hilight area
bug:
12560596
Change-Id: Ib0032bc6be21107361605f109caa5e5de7e4b682
Angus Kong [Wed, 15 Jan 2014 17:44:16 +0000 (09:44 -0800)]
Fix size of filmstrip bottom controls sizes.
bug:
12550232
Change-Id: Ib73d0ccf16304b706781ea2760d22c668cde2aa8
Doris Liu [Wed, 15 Jan 2014 01:51:32 +0000 (17:51 -0800)]
Fix face view in simple camera
Part II at ag/407562
Bug:
12460604
Change-Id: I9532d5dae7c156568fef944b81127c6ff194a394
Angus Kong [Wed, 15 Jan 2014 01:03:24 +0000 (01:03 +0000)]
Merge "Returns unwrapped refreshed in-progress data." into gb-ub-photos-denali
Angus Kong [Wed, 15 Jan 2014 00:37:26 +0000 (16:37 -0800)]
Returns unwrapped refreshed in-progress data.
bug:
12550918
Change-Id: Ia5794abb96abb980c06e874f4fd5d08ca5884343
Angus Kong [Tue, 14 Jan 2014 22:25:45 +0000 (14:25 -0800)]
Up affordance should act as back key in 1up view.
bug:
12549094
Change-Id: Id19e2532d9aae929ee15e518a6cd125ff4e550ac
Erin Dahlgren [Tue, 14 Jan 2014 23:24:46 +0000 (15:24 -0800)]
On screen indicators in top right in landscape.
Bug:
12525286
Change-Id: I5c56d0498504b2ec37211523c6212b6925ec7bf5
Angus Kong [Mon, 13 Jan 2014 23:06:17 +0000 (15:06 -0800)]
Add more filmstrip fullscreen states.
And callbacks for new state events also.
bug:
12468756
Change-Id: I0ebdd99f251394a871c1e050e565fc5cd1706324
Erin Dahlgren [Tue, 14 Jan 2014 19:14:27 +0000 (19:14 +0000)]
Merge "Fix stale button references." into gb-ub-photos-denali
Erin Dahlgren [Tue, 14 Jan 2014 19:08:59 +0000 (11:08 -0800)]
Fix stale button references.
Bug:
12537343
Change-Id: I9c48f9dcfe82afbf89562010daf94b767d53911c
Spike Sprague [Tue, 14 Jan 2014 19:07:22 +0000 (11:07 -0800)]
fix for bottom bar not taking set color immediately
half of b/
12537343
Change-Id: Ib9fe344be9c6d24af6b6b246f13070d4c21d00f1
Doris Liu [Tue, 14 Jan 2014 01:29:40 +0000 (17:29 -0800)]
Add aggressive continuous auto focus to video preview
Also added touch to focus for video preview
Part II is at ag/407029
Bug:
12368866
Change-Id: I8dd544d5bb6b5128ae99c9b7fe4dffeb1f843ab9
Spike Sprague [Tue, 14 Jan 2014 02:10:54 +0000 (18:10 -0800)]
capture button pressed colors
Change-Id: Ia568be11e6f9b6160f3f8332b504866cbe6ac94f
Spike Sprague [Mon, 13 Jan 2014 22:22:18 +0000 (14:22 -0800)]
new video bottom bar ui
crossfade record <-> stop
full bar <-> single button cicle wipe
Change-Id: I58e0ddd94221374809acd52a6f0649e419203f54
Angus Kong [Tue, 14 Jan 2014 01:58:53 +0000 (01:58 +0000)]
Merge "Move external view button to the bottom" into gb-ub-photos-denali
Angus Kong [Tue, 14 Jan 2014 01:38:34 +0000 (17:38 -0800)]
Move external view button to the bottom
Change-Id: Ic7a213335b6a5bddacb2ea5ed450626fc5bdbc69
Erin Dahlgren [Tue, 14 Jan 2014 01:30:43 +0000 (01:30 +0000)]
Merge "Sync dependencies between bottom bar options." into gb-ub-photos-denali
Erin Dahlgren [Tue, 14 Jan 2014 00:26:00 +0000 (00:26 +0000)]
Merge "Match dimens of TopRightMostOverlay child with the ReferenceView." into gb-ub-photos-denali
Erin Dahlgren [Fri, 10 Jan 2014 06:17:38 +0000 (22:17 -0800)]
Sync dependencies between bottom bar options.
* Centralizes the bottom bar button customization.
* Makes HDR+ and front camera exclusive.
Bug:
12469207
Change-Id: I65e3d16d314a26889f04e9bcc26fa4bf095150b7
Conflicts:
src/com/android/camera/ButtonManager.java
Angus Kong [Mon, 13 Jan 2014 22:44:25 +0000 (22:44 +0000)]
Merge "Clear the camera instance before switching." into gb-ub-photos-denali
Erin Dahlgren [Mon, 13 Jan 2014 21:51:25 +0000 (21:51 +0000)]
Merge "Sync new ux-assets." into gb-ub-photos-denali
Erin Dahlgren [Mon, 13 Jan 2014 20:39:56 +0000 (12:39 -0800)]
Sync new ux-assets.
Change-Id: I12bf5f8b058cda17517943c76a826ce9887392ed
Erin Dahlgren [Mon, 13 Jan 2014 20:25:45 +0000 (12:25 -0800)]
Match dimens of TopRightMostOverlay child with the ReferenceView.
Change-Id: I356059893bcc3bb8ffda1aef9726f8df4466f42c
Erin Dahlgren [Mon, 13 Jan 2014 20:12:26 +0000 (20:12 +0000)]
Merge "Ensure that SharedPreference listeners respond to known keys." into gb-ub-photos-denali
Erin Dahlgren [Mon, 13 Jan 2014 19:38:37 +0000 (19:38 +0000)]
Merge "Make Front and back camera a mode specific setting." into gb-ub-photos-denali
Erin Dahlgren [Mon, 13 Jan 2014 19:35:16 +0000 (11:35 -0800)]
Ensure that SharedPreference listeners respond to known keys.
Bug:
12439970
Change-Id: Ic4cbfd9823a17294af3b2d3eecd654131bf92cd5
Erin Dahlgren [Fri, 10 Jan 2014 19:24:31 +0000 (11:24 -0800)]
Make Front and back camera a mode specific setting.
Bug:
12467987
Change-Id: I69b788565979bb45df511974e1e494f7a5ffe9d8
Angus Kong [Sat, 11 Jan 2014 01:45:27 +0000 (17:45 -0800)]
Refresh the current item after editing
We currently only support calling external editor on the current item of
filmstrip. After returning from other apps, we should refresh the current item
in case it's modified. Also handles the case of data being removed.
bug:
12412022
Change-Id: Idf86603ffd75a825f1311f83b3d38181d1eba16f
Spike Sprague [Fri, 10 Jan 2014 21:31:07 +0000 (21:31 +0000)]
Merge "make buttons opaque when bottom bar is translucent" into gb-ub-photos-denali
Erin Dahlgren [Fri, 10 Jan 2014 20:53:02 +0000 (12:53 -0800)]
Bring on screen indicators up to spec.
* 48x48dp background radius
* 20dp padding on overlay
* background color 30% opaque black
Bug:
12368905
Change-Id: Iaff0d915ed64a9a499574bc0728e79159dd121dd
Erin Dahlgren [Thu, 2 Jan 2014 21:57:43 +0000 (13:57 -0800)]
Show registered modes as default camera options.
Bug:
12178782
Change-Id: I1dc4c3d9a6bf6448e0083b508210577584a35a1c
Erin Dahlgren [Fri, 10 Jan 2014 18:04:55 +0000 (18:04 +0000)]
Merge "Add a refocus on screen indicator." into gb-ub-photos-denali
Erin Dahlgren [Fri, 10 Jan 2014 01:55:21 +0000 (01:55 +0000)]
Merge "Close bottom bar options menu on specific triggers." into gb-ub-photos-denali
Erin Dahlgren [Thu, 9 Jan 2014 22:30:34 +0000 (14:30 -0800)]
Close bottom bar options menu on specific triggers.
* on touching anywhere in the preview
* after n milliseconds after touching an option
Bug:
12447283
Change-Id: If44d83a601b4281711f7006b2ab771edfd588117
Erin Dahlgren [Thu, 9 Jan 2014 23:09:05 +0000 (15:09 -0800)]
Add a refocus on screen indicator.
Bug:
12475491
Change-Id: Icf62df3232c2f129cd8c09f4b27464d4e645d762
Angus Kong [Thu, 9 Jan 2014 08:56:35 +0000 (00:56 -0800)]
Continue the animation after the data is updated.
When the data is updated, the animation is interrupted because of the original
view is replaced by the new one from the new data. We should copy the original
animation and continue.
Handles the condition when the last photo is deleted.
Also some refinement of the codes.
bug:
12196441
bug:
12476802
Change-Id: I2139b09bf5f958af6fa21b91e3d0c14908e1ba79
Sascha Haeberling [Thu, 9 Jan 2014 22:24:55 +0000 (22:24 +0000)]
Merge "Move Refocus' processing service to common code." into gb-ub-photos-denali
Doris Liu [Sat, 4 Jan 2014 01:59:51 +0000 (17:59 -0800)]
Centralize camera mode resources
Moved camera mode related resources such as mode theme color, mode
icon, text, mode id, etc to resources xml. And created utility
functions to query for them.
Part II at ag/404854
Change-Id: I828502c76851cc2ed0b632b1ed4bb7f702fee231
Spike Sprague [Thu, 9 Jan 2014 20:22:36 +0000 (12:22 -0800)]
make buttons opaque when bottom bar is translucent
bug:
12450498
Change-Id: I61891ab4118efd9b4ebca1c1a4a9a00eabb213cb
Spike Sprague [Thu, 9 Jan 2014 19:54:17 +0000 (11:54 -0800)]
video capture icon
bug:
12440820
Change-Id: I276e1260c494519beaf95258129e1f240bdafd59
Sascha Haeberling [Tue, 7 Jan 2014 17:36:14 +0000 (09:36 -0800)]
Move Refocus' processing service to common code.
Bug:
12080035
Bug:
12211113
Also mimic the ServiceManager interface we use for Photo Sphere
to make interacting with the service easier. It now starts up
automatically and shuts down after the queue is processed.
Change-Id: Ie48ec8bc1ab55ff10ce6965a660239eb579b5499
Erin Dahlgren [Wed, 8 Jan 2014 22:34:35 +0000 (14:34 -0800)]
Add dynamically sized transparent background to indicators.
Change-Id: Ie9d8214b665ae134fda66c17707d50040cf3f837
Erin Dahlgren [Thu, 9 Jan 2014 17:23:14 +0000 (17:23 +0000)]
Merge "Layout on screen indicators in landscape startup." into gb-ub-photos-denali
Baligh Uddin [Thu, 9 Jan 2014 04:08:19 +0000 (04:08 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Erin Dahlgren [Wed, 8 Jan 2014 17:35:42 +0000 (09:35 -0800)]
Layout on screen indicators in landscape startup.
Change-Id: I20ca5b54a6f7417b0d2c0bda743d08f53a369039
Angus Kong [Thu, 9 Jan 2014 02:38:03 +0000 (18:38 -0800)]
Clear the camera instance before switching.
bug:
12452510
Change-Id: If8bbd4d8a15ce2ba65659c02063da3a2960142ce
Doris Liu [Thu, 9 Jan 2014 01:09:13 +0000 (01:09 +0000)]
Merge "Stops playing shimmy after 10 sessions where mode drawer is swiped open" into gb-ub-photos-denali
Doris Liu [Thu, 9 Jan 2014 00:04:38 +0000 (16:04 -0800)]
Stops playing shimmy after 10 sessions where mode drawer is swiped open
Bug:
12412506
Change-Id: Ib2e62fa93c5e1bca5eb547a6a74f688f0b0cb633
Emil Arfvidsson [Thu, 26 Dec 2013 22:40:34 +0000 (14:40 -0800)]
Move the Gallery shortcut to the action bar.
Change-Id: I0f2c7c72ff9ed3b5a243350b562cd4432bea1911
Angus Kong [Wed, 8 Jan 2014 22:25:26 +0000 (22:25 +0000)]
Merge "Remove the dependency on CameraHolder." into gb-ub-photos-denali
Angus Kong [Tue, 7 Jan 2014 19:29:44 +0000 (11:29 -0800)]
Remove the dependency on CameraHolder.
Change-Id: I39882f1bf2a4cd730d00ceabc7705692bcee6bc0
Baligh Uddin [Wed, 8 Jan 2014 19:31:28 +0000 (11:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id0064b0fc89d4b42e15174d081e2f2993e1c20f6
Auto-generated-cl: translation import
Spike Sprague [Wed, 8 Jan 2014 18:05:02 +0000 (10:05 -0800)]
emergency fix for capture button triggering settings button
bug:
12441462
Change-Id: I1c386450331ebceb3bcabf1014ec4202b07f0d75
Erin Dahlgren [Wed, 8 Jan 2014 01:16:20 +0000 (17:16 -0800)]
Unify setting the bottom bar color.
* Camera, Video, Advanced Camera
Change-Id: I862543c52372e0028debda7e89a56ebf8e737270
Erin Dahlgren [Tue, 7 Jan 2014 23:11:33 +0000 (23:11 +0000)]
Merge "Show onscreen indicators for enabled and visible options." into gb-ub-photos-denali
Erin Dahlgren [Tue, 7 Jan 2014 19:46:57 +0000 (11:46 -0800)]
Show onscreen indicators for enabled and visible options.
Bug:
12434780
Change-Id: I85a3efba46303fc47f456d696d89b0ca2997f9f6
Spike Sprague [Tue, 7 Jan 2014 22:16:38 +0000 (22:16 +0000)]
Merge "extending button hitbox to entire bar height; added bottom bar touch listerner to fire capture" into gb-ub-photos-denali
Sascha Haeberling [Tue, 7 Jan 2014 22:12:29 +0000 (22:12 +0000)]
Merge "Enable lights-out mode at all times." into gb-ub-photos-denali
Spike Sprague [Thu, 2 Jan 2014 19:42:12 +0000 (11:42 -0800)]
extending button hitbox to entire bar height; added bottom bar touch listerner to fire capture
Change-Id: I4d969060acf2abe2863e15b9c8f2219303e62eca
Sascha Haeberling [Tue, 7 Jan 2014 21:31:19 +0000 (13:31 -0800)]
Enable lights-out mode at all times.
Bug:
12429885
Change-Id: I92481003b408cd63334dd8dd4b2df1603b7432e3
Doris Liu [Tue, 7 Jan 2014 21:12:07 +0000 (21:12 +0000)]
Merge "Handle camera orientation change when device is flipped" into gb-ub-photos-denali
Doris Liu [Tue, 7 Jan 2014 18:52:11 +0000 (10:52 -0800)]
Handle camera orientation change when device is flipped
Bug:
12414864
Bug:
12179046
Change-Id: I645709bdfe6ae5678b4a59b7c4a4c893c2827b52
Erin Dahlgren [Tue, 7 Jan 2014 19:20:45 +0000 (19:20 +0000)]
Merge "Make refocus and hdr+ sticky on mode change." into gb-ub-photos-denali
Erin Dahlgren [Tue, 7 Jan 2014 18:12:15 +0000 (10:12 -0800)]
Avoid ConcurrentModificationException in SettingsManager.
Bug:
12433904
Change-Id: I7d7f3ebf0a17f5e01c4e0ea8b5731a0bac9095d2
Erin Dahlgren [Tue, 7 Jan 2014 01:31:23 +0000 (17:31 -0800)]
Make refocus and hdr+ sticky on mode change.
Bug:
12413073
Bug:
12368672
Change-Id: I151581c73bafbf307889b6aa19131c4add400ba9
Erin Dahlgren [Tue, 7 Jan 2014 17:32:08 +0000 (17:32 +0000)]
Merge "Make flash state sticky on switching to photo mode." into gb-ub-photos-denali
Erin Dahlgren [Tue, 7 Jan 2014 05:34:28 +0000 (05:34 +0000)]
Merge "Add on screen indicators." into gb-ub-photos-denali
Erin Dahlgren [Mon, 6 Jan 2014 23:06:04 +0000 (15:06 -0800)]
Add on screen indicators.
Known caveats:
* Does not respect the first orientation change.
* PhotoModule resets flash to default on a mode switch.
* Hdr plus is not sticky on mode switch.
Bug:
12368905
Change-Id: I377f28c6d0f7115371cc9e9dad9378f049bf7d7c
Erin Dahlgren [Tue, 7 Jan 2014 01:55:24 +0000 (17:55 -0800)]
Make flash state sticky on switching to photo mode.
Bug:
12368672
Change-Id: I8ff680efcd4eb55e1773853889580f7f792938a5
Doris Liu [Mon, 6 Jan 2014 23:46:02 +0000 (15:46 -0800)]
Remove old faceview offset for centering surface texture
Bug:
12413526
We used to offset face view to take into account the translation
needed to center the scaled surface texture in the view. That's no
longer needed because the live preview in this new design aligns
top left.
Change-Id: Ic38ef697dbbda1ad5b80a5797ba1d01fc3dd6ad8
Spike Sprague [Mon, 6 Jan 2014 22:17:00 +0000 (22:17 +0000)]
Merge "hide bottom bar during video capture" into gb-ub-photos-denali
Spike Sprague [Mon, 6 Jan 2014 20:29:44 +0000 (12:29 -0800)]
hide bottom bar during video capture
simple visibilty change; jarring but good for a first pass
bug:
12368245
Change-Id: Ief01aae1e9f3d9fd229952dc664f766328ac1e0c
Doris Liu [Mon, 6 Jan 2014 21:39:11 +0000 (21:39 +0000)]
Merge "Center preview UI in the live preview rect" into gb-ub-photos-denali
Angus Kong [Mon, 6 Jan 2014 21:02:23 +0000 (21:02 +0000)]
Merge "Check filmstrip visibility to pass down key events" into gb-ub-photos-denali
Sascha Haeberling [Mon, 6 Jan 2014 20:04:49 +0000 (20:04 +0000)]
Merge "Clean-up TAGs and some more auto-clean-ups." into gb-ub-photos-denali
Sascha Haeberling [Mon, 6 Jan 2014 19:02:35 +0000 (11:02 -0800)]
Clean-up TAGs and some more auto-clean-ups.
Change-Id: Ib5f01a6fed99dd21b87138d8e4f792aefa74880d
Erin Dahlgren [Mon, 6 Jan 2014 18:56:28 +0000 (18:56 +0000)]
Merge "Update camera parameters when setting has changed." into gb-ub-photos-denali
OSDN Git Service
