OSDN Git Service
Erin Dahlgren [Tue, 10 Dec 2013 21:19:35 +0000 (13:19 -0800)]
Support continous zoom ranges in PreviewOverlay.
Change-Id: I46ee4f515ef159bbd2018dde43310c0327fa6e48
Angus Kong [Sat, 7 Dec 2013 21:52:51 +0000 (13:52 -0800)]
Move data-related controls with filmstrip.
bug:
12015169
Change-Id: I3185acc37adec23fc696f6693236178779a7459e
Angus Kong [Tue, 10 Dec 2013 19:06:54 +0000 (19:06 +0000)]
Merge "Catch some corner cases for filmstrip." into gb-ub-photos-denali
Angus Kong [Tue, 10 Dec 2013 09:06:43 +0000 (01:06 -0800)]
Catch some corner cases for filmstrip.
1. When no items on the filmstrip, don't show the filmstrip.
2. NPEs when start with empty filmstrip.
3. More comments.
Change-Id: I8b8a592e7f64d870e7ff7ecf0255a57b289de7bf
Doris Liu [Tue, 10 Dec 2013 19:01:23 +0000 (19:01 +0000)]
Merge "Setup preview status listener for preview related changes" into gb-ub-photos-denali
Sascha Haeberling [Tue, 10 Dec 2013 18:51:22 +0000 (10:51 -0800)]
Target only K devices and up, explicitely.
Bug:
12060982
Change-Id: Ia15775773f7135e9596b48be2a8e530b4f52452e
Doris Liu [Tue, 10 Dec 2013 03:36:25 +0000 (19:36 -0800)]
Setup preview status listener for preview related changes
Change-Id: Ibd8341dfbe5e03ec77c149e671f4dd991833e678
Erin Dahlgren [Tue, 10 Dec 2013 01:58:15 +0000 (01:58 +0000)]
Merge "Make RenderOverlay only respond to tap listener events." into gb-ub-photos-denali
Doris Liu [Tue, 10 Dec 2013 01:05:38 +0000 (01:05 +0000)]
Merge "New keyguard layout" into gb-ub-photos-denali
Doris Liu [Tue, 10 Dec 2013 00:37:17 +0000 (16:37 -0800)]
New keyguard layout
Bug:
12060595
Change-Id: I32b0b6353bf8e569798901ba451daa91f11d8cb1
Erin Dahlgren [Tue, 10 Dec 2013 00:29:38 +0000 (16:29 -0800)]
Make RenderOverlay only respond to tap listener events.
* Note: this is temporary and makes refactoring the UI of
Gcam easier. Soon RenderOverlay will not be a dependency.
Change-Id: I7a328f3f7a33a495a1b51bb4bf8b5b558f3ff43e
Doris Liu [Mon, 9 Dec 2013 23:19:06 +0000 (15:19 -0800)]
Only display supported modes in mode drawer
Change-Id: I1891de0ca485db7d24982b2e73ac5d415480813e
Angus Kong [Mon, 9 Dec 2013 23:32:31 +0000 (23:32 +0000)]
Merge "Re-design callbacks from filmstrip." into gb-ub-photos-denali
Angus Kong [Sat, 7 Dec 2013 08:38:46 +0000 (00:38 -0800)]
Re-design callbacks from filmstrip.
Enumerated the possible states of filmstrip and have proper callbacks when
entering/leaving each of the states.
Change-Id: I5a6e931095bb0792e0832fda11d1f1b5ba850263
Erin Dahlgren [Mon, 9 Dec 2013 22:33:45 +0000 (22:33 +0000)]
Merge "Make the ButtonManager api associative." into gb-ub-photos-denali
Erin Dahlgren [Fri, 6 Dec 2013 20:07:33 +0000 (12:07 -0800)]
Make the ButtonManager api associative.
* Makes handling dependent behavior between buttons
less error prone.
Change-Id: I13acf3475c46573668e0c8fee633e71efafd9588
Baligh Uddin [Mon, 9 Dec 2013 20:05:27 +0000 (12:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: If4326347ceb38842b88e44332a3120e87496c7b9
Auto-generated-cl: translation import
Angus Kong [Sat, 7 Dec 2013 08:11:48 +0000 (00:11 -0800)]
A quick not-so-good fix for action bar issue.
Will remove this fix after the filmstrip callback is re-designed.
Change-Id: Ie445581ab8c3a1fc3e474bef96366932d52ddcc9
Doris Liu [Sat, 7 Dec 2013 05:58:41 +0000 (21:58 -0800)]
Keep swipe left/right functioning in all modules
Change-Id: I230b93c713a038595a06581cf10f48f49f50196b
Angus Kong [Sat, 7 Dec 2013 05:17:48 +0000 (05:17 +0000)]
Merge "Add CameraProvider methods to check camera facing." into gb-ub-photos-denali
Angus Kong [Sat, 7 Dec 2013 04:55:36 +0000 (20:55 -0800)]
Add CameraProvider methods to check camera facing.
Change-Id: Iba0f21a65a44bed1a26fa375a050e4879701bd72
Doris Liu [Sat, 7 Dec 2013 05:02:53 +0000 (21:02 -0800)]
Cleanup after camera root is moved out of filmstrip
Change-Id: I9e6efea3848f2f618aefc888ba7cca364fb64085
Doris Liu [Sat, 7 Dec 2013 02:11:51 +0000 (18:11 -0800)]
Refining shimmy
Bug:
11858581
Change-Id: I7eefc5189caefc6d23d2dbbca243632db716b0c3
Doris Liu [Sat, 7 Dec 2013 01:33:20 +0000 (01:33 +0000)]
Merge "Mode drawer with more fluid dragging" into gb-ub-photos-denali
Doris Liu [Fri, 6 Dec 2013 09:08:59 +0000 (01:08 -0800)]
Mode drawer with more fluid dragging
Change-Id: Ie897988a5efd6180a9b92c61487497b08ca16324
Doris Liu [Sat, 7 Dec 2013 00:48:01 +0000 (00:48 +0000)]
Merge "Redesign preview Overlay for simplicity" into gb-ub-photos-denali
Doris Liu [Thu, 5 Dec 2013 02:04:22 +0000 (18:04 -0800)]
Redesign preview Overlay for simplicity
Simplify how preview overlay should be setup from each module
Refactored PhotoUI and VideoUI to use the new Overlay
Change-Id: Ia8c7c71215007c9aaba69e55353b554e8fdf3c90
Angus Kong [Fri, 6 Dec 2013 23:49:17 +0000 (15:49 -0800)]
Change the home logo and the behavior of actionbar
Change-Id: I2a930fafd22ea36ae2a84b749c54f64c67a7d06d
Erin Dahlgren [Fri, 6 Dec 2013 04:04:58 +0000 (04:04 +0000)]
Merge "Create a ButtonManager for managing common button behaviors." into gb-ub-photos-denali
Angus Kong [Fri, 6 Dec 2013 03:13:57 +0000 (03:13 +0000)]
Merge "Remove build target and codes for legacy panorama." into gb-ub-photos-denali
Erin Dahlgren [Thu, 5 Dec 2013 22:53:38 +0000 (14:53 -0800)]
Create a ButtonManager for managing common button behaviors.
Change-Id: I02d99c393a01e6de9ffb2f4f351a832b4eae9e37
Angus Kong [Fri, 6 Dec 2013 00:34:42 +0000 (00:34 +0000)]
Merge "Add quantum paper background for filmstrip." into gb-ub-photos-denali
Angus Kong [Thu, 5 Dec 2013 07:38:00 +0000 (23:38 -0800)]
Add quantum paper background for filmstrip.
Also fix the issue of flickering when swiping out filmstrip.
bug:
11898278
Change-Id: I0fd0c394cd8c14d70fd7ef1c912ab05d2a5c6668
Angus Kong [Thu, 5 Dec 2013 22:19:15 +0000 (14:19 -0800)]
Remove build target and codes for legacy panorama.
bug:
11811982
Change-Id: I733e80511d8eecdd1dbc90daf9b7f9fb709a2766
Angus Kong [Thu, 5 Dec 2013 22:09:53 +0000 (22:09 +0000)]
Merge "Replace legacy wide-angle panorama with new one." into gb-ub-photos-denali
Angus Kong [Thu, 5 Dec 2013 20:40:24 +0000 (12:40 -0800)]
Replace legacy wide-angle panorama with new one.
Change-Id: I55977b1a3346bfc45782eed3791e34cac423ee96
Doris Liu [Thu, 5 Dec 2013 21:25:30 +0000 (21:25 +0000)]
Merge "Change mode drawer text weight to light, change camera mode color" into gb-ub-photos-denali
Doris Liu [Thu, 5 Dec 2013 21:11:22 +0000 (13:11 -0800)]
Change mode drawer text weight to light, change camera mode color
Bug:
11996762
Bug:
11996767
Change-Id: I51ca31795856b91bc78f6d579dd33ec527c1f57b
Erin Dahlgren [Thu, 5 Dec 2013 02:44:08 +0000 (18:44 -0800)]
Remove dependency on preference groups from video mode.
Change-Id: I40f69fa1267d0500125c786bb550052bbd200f9e
Angus Kong [Thu, 5 Dec 2013 01:12:21 +0000 (01:12 +0000)]
Merge "Implement the new filmstrip UI - first step." into gb-ub-photos-denali
Angus Kong [Tue, 3 Dec 2013 16:54:42 +0000 (08:54 -0800)]
Implement the new filmstrip UI - first step.
More fancy stuffs will be added in the following CLs.
Change-Id: I065c7baf1ff9695121db4917158ffecd0bfc0d01
Erin Dahlgren [Thu, 5 Dec 2013 01:08:32 +0000 (17:08 -0800)]
Fix broken build.
Change-Id: If7483de46934eb81d599367191291d453d715bae
Erin Dahlgren [Thu, 5 Dec 2013 00:47:42 +0000 (16:47 -0800)]
Fix the build.
* A duplicate res string compiles locally but fails on the build servers.
Change-Id: I5fa1748fa65a1c1595c88af2bb2ca9a9e1a65e58
Erin Dahlgren [Thu, 5 Dec 2013 00:38:12 +0000 (00:38 +0000)]
Merge "Remove photo mode dependency on preference groups." into gb-ub-photos-denali
Erin Dahlgren [Tue, 3 Dec 2013 21:10:27 +0000 (13:10 -0800)]
Remove photo mode dependency on preference groups.
Bug:
11967053
Change-Id: I3058a1931d92fa006da9e16bdcc2b5f864b1eacb
Geoff Mendal [Wed, 4 Dec 2013 21:45:10 +0000 (13:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia63e893030e0da26bd05e5aef611b40284411a8c
Auto-generated-cl: translation import
Michael Kolb [Thu, 30 May 2013 14:45:41 +0000 (07:45 -0700)]
Fix samsung video recording
Patching Bryce CL into Denali
Bug:
9056573
Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9
Conflicts:
src/com/android/camera/VideoModule.java
Angus Kong [Tue, 3 Dec 2013 18:53:28 +0000 (18:53 +0000)]
Merge "Make onLayoutOrientationChanged to take a boolean." into gb-ub-photos-denali
Doris Liu [Tue, 3 Dec 2013 18:27:03 +0000 (18:27 +0000)]
Merge "Remove deprecated fitSystemWindows logic" into gb-ub-photos-denali
Michael Kolb [Thu, 11 Jul 2013 20:48:15 +0000 (13:48 -0700)]
Revert fixed focus area in CAF mode
Bug:
9306098
This doesn't set the faces as focus/exp areas yet, but resets the focus area to null
in CAF mode to let the HAL decide focus/exp area.
Cherrypick of Bryce CL into Denali.
Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0
Conflicts:
src/com/android/camera/FocusOverlayManager.java
Angus Kong [Tue, 3 Dec 2013 18:02:35 +0000 (10:02 -0800)]
Make onLayoutOrientationChanged to take a boolean.
ModuleController.onLayoutOrientationChanged() call back can just take a boolean
to know whether the layout orientation is in landscape or portrait.
Change-Id: I1675cbea263b12bb0b568a6038f0fc17dd03799a
Michael Kolb [Fri, 12 Jul 2013 18:36:47 +0000 (11:36 -0700)]
Always set focus mode first before applying scene mode
Patching Bryce CL into Denali.
Bug:
9577903
Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
Alan Newberger [Tue, 3 Dec 2013 17:27:54 +0000 (17:27 +0000)]
Merge "Add another HTC picture resolution" into gb-ub-photos-denali
Erin Dahlgren [Tue, 3 Dec 2013 02:49:25 +0000 (02:49 +0000)]
Merge "Remove ComboPreferences from video mode." into gb-ub-photos-denali
Doris Liu [Tue, 3 Dec 2013 02:13:37 +0000 (18:13 -0800)]
Remove deprecated fitSystemWindows logic
Change-Id: I6393db86b017652dfc16f41a0a915fc5e7cff6a0
Michael Kolb [Wed, 12 Jun 2013 18:57:45 +0000 (11:57 -0700)]
Add another HTC picture resolution
Bug:
9370319
Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc
Conflicts:
res/values/strings.xml
Doris Liu [Tue, 3 Dec 2013 01:46:21 +0000 (01:46 +0000)]
Merge "No longer lay out under nav bar." into gb-ub-photos-denali
Doris Liu [Tue, 3 Dec 2013 01:35:03 +0000 (17:35 -0800)]
No longer lay out under nav bar.
Gutted out camera root view that was intended to lay out its child
views correctly when it is laid out under the nav bar.
Change-Id: Iee33daf63dd6a592577f59010f0fc6b71a126f7c
Angus Kong [Mon, 2 Dec 2013 23:04:23 +0000 (23:04 +0000)]
Merge "Change to have finer callbacks." into gb-ub-photos-denali
Sascha Häberling [Mon, 2 Dec 2013 22:16:40 +0000 (22:16 +0000)]
Merge "Reduce logging of flattened Preferences" into gb-ub-photos-denali
Angus Kong [Mon, 2 Dec 2013 07:21:49 +0000 (23:21 -0800)]
Change to have finer callbacks.
onConfigurationChanged() is too general since the configuration contains many
things. Should use finer callbacks for each of the changes we care about.
Change-Id: I5ffbb7f1f71e6675a4fbb07e564ae09f55fa5127
Geoff Mendal [Mon, 2 Dec 2013 20:37:25 +0000 (12:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4078de5d36a71f3c0ff7ff4522b2034c2a890b3d
Auto-generated-cl: translation import
Erin Dahlgren [Mon, 2 Dec 2013 19:48:13 +0000 (11:48 -0800)]
Remove ComboPreferences from video mode.
Change-Id: Iab54672feee066e23543c7a7dbb19e5118ec214c
Seth Raphael [Wed, 27 Nov 2013 22:29:24 +0000 (14:29 -0800)]
Reduce logging of flattened Preferences
Bug:
11901390
Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
Christian Wyglendowski [Tue, 26 Nov 2013 22:16:04 +0000 (14:16 -0800)]
Add base support for camera user feedback
By default it does nothing. Implementations need to provide their own
FeedbackHelper class that handles submitting feedback for the app.
Bug:
8155939
Change-Id: I33536267fcc4c3f9aecd957c6064963f5e9d1b6c
Marco Nelissen [Fri, 22 Nov 2013 01:47:37 +0000 (01:47 +0000)]
initial simple camera pruning and refactoring
100% preview and new ui bottom bar
bug:
11514604
Change-Id: I010c8aaa41ad6791ce2443ef159ea22cc1e8346f
Angus Kong [Wed, 27 Nov 2013 23:13:34 +0000 (15:13 -0800)]
No need to upgrade preferences.
Since we changed the package name in Carlsbad, there is no old versions of
preferences anymore for now. We can skip upgrade the preferences file from
previous versions in modules. Instead we do this in the activity although it's
an no-op for now.
Change-Id: Ibb153d4f8f80b6891fb4cb00d13cd8a386ee44a9
Geoff Mendal [Wed, 27 Nov 2013 20:50:35 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Geoff Mendal [Wed, 27 Nov 2013 20:43:35 +0000 (12:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I926176b385eea4bc77de84a8daf3c1175b88f6c9
Auto-generated-cl: translation import
Erin Dahlgren [Wed, 27 Nov 2013 20:29:25 +0000 (20:29 +0000)]
Merge "Make the entire listview row clickable." into gb-ub-photos-denali
Erin Dahlgren [Wed, 27 Nov 2013 18:42:10 +0000 (10:42 -0800)]
Make the entire listview row clickable.
Change-Id: I616ff498c7a8bdfdc11d9a6c013ef34f35f310f1
Erin Dahlgren [Mon, 25 Nov 2013 21:22:07 +0000 (13:22 -0800)]
Refactor settings dialogs.
* Adds first time location dialog.
* Makes all settings dialogs static.
* Moves initialization of first time location dialog.
Change-Id: If93f6a9c903f422409bda478b8cb76442eb0ad82
Sameer Padala [Wed, 6 Nov 2013 02:49:12 +0000 (18:49 -0800)]
Update SmartCamera UI
Change-Id: Icf04a24656aaaf2a4dfc948e9d4e9a16b2a51f69
Erin Dahlgren [Mon, 25 Nov 2013 23:21:18 +0000 (15:21 -0800)]
Optimize Settings api.
* Caches settings descriptors.
* Uses a hashmap for finding setting descriptor from key.
Change-Id: I97fb536a2b30226896644b56911d4aec3c61cda5
Erin Dahlgren [Tue, 26 Nov 2013 16:54:35 +0000 (16:54 +0000)]
Merge "Add a divider to the settings popup menu." into gb-ub-photos-denali
Angus Kong [Tue, 26 Nov 2013 04:02:59 +0000 (04:02 +0000)]
Merge "Migrate from old CameraModule to ModuleController." into gb-ub-photos-denali
Erin Dahlgren [Tue, 26 Nov 2013 02:29:26 +0000 (18:29 -0800)]
Add a divider to the settings popup menu.
Change-Id: I88462733dadb8073ad8a37c721c1b052eb2fb604
Angus Kong [Mon, 25 Nov 2013 18:02:47 +0000 (10:02 -0800)]
Migrate from old CameraModule to ModuleController.
The following methods are removed.
init() of old module interface
onUserInteraction()
installIntetFilter()
onPreviewTextureCopied()
onCaptureTextureCopied()
onStop()
onActivityResult()
onShowSwitcherPopup
updateStorageHintOnResume()
The logic of controlling screen on/off is moved to CameraActivity.
Change-Id: I6807ac6bc314bdfcfe47273baf071be94098fd44
Sascha Haeberling [Mon, 25 Nov 2013 21:22:19 +0000 (21:22 +0000)]
Merge "String fixes." into gb-ub-photos-denali
Sascha Haeberling [Mon, 25 Nov 2013 21:15:15 +0000 (13:15 -0800)]
String fixes.
Bug:
10550622
Bug:
10547805
Change-Id: I72b49a944387fd7fca379feb1aaec0d0322ab0a8
Geoff Mendal [Mon, 25 Nov 2013 21:00:16 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Geoff Mendal [Mon, 25 Nov 2013 19:53:54 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: If3581e5f932d92ac36b1259268f5ea04468ab954
Auto-generated-cl: translation import
Erin Dahlgren [Thu, 21 Nov 2013 01:38:14 +0000 (17:38 -0800)]
Build out the SettingsManager model.
Change-Id: Ie831dbf624efc5c7e27924785a0ec193b3ce53bd
Doris Liu [Sun, 24 Nov 2013 08:02:49 +0000 (00:02 -0800)]
Change asset name
Change-Id: I60ef126dc992afb4ab9d7ea2f6a3c48298663c3a
Angus Kong [Sun, 24 Nov 2013 07:56:00 +0000 (07:56 +0000)]
Merge "Fix build." into gb-ub-photos-denali
Angus Kong [Sun, 24 Nov 2013 07:48:55 +0000 (23:48 -0800)]
Fix build.
Change-Id: I9976a6dcdc940b2c6bf43841e2ceb3dda5c6597e
Doris Liu [Wed, 20 Nov 2013 08:24:46 +0000 (00:24 -0800)]
Pinhole animation, quick switch between photo and video
Also, first pass of the view hierarchy refactor.
Change-Id: I6c80191f15908bd24c16b76df6ef92df3ef905fc
Angus Kong [Sat, 23 Nov 2013 07:03:21 +0000 (23:03 -0800)]
Consolidate onResume* and onPause* in modules.
1. Combine onResumeAfterSuper() and onResumeBeforeSuper() to resume().
2. Combine onPauseAfterSuper() and onPauseBeforeSuper() to pause().
3. Add helper function requestBackCamera() to CameraModule.
Change-Id: Ie0ffb0168e2df1e77aba4ead4f8729eca09c894a
Angus Kong [Fri, 22 Nov 2013 02:14:14 +0000 (18:14 -0800)]
Refactor PhotoSphere and Refocus: new camera open
This is part of the Denali refactor work. Now PhotoSphere and Refocus both uses
the new camera start up process so the camera is not released between modules.
See http://ag/392043/
Change-Id: I6ae9b111ba1fda33912159e0967f3a12d02937ba
Andy Huibers [Fri, 22 Nov 2013 17:13:39 +0000 (09:13 -0800)]
Delay onResume tasks to speed up lockscreen
onResume->onPause->onResume launch sequence.
Change-Id: I819ba9893c1fbcf0c6e15a91a5733978dcdb9e1f
Marco Nelissen [Fri, 22 Nov 2013 01:47:37 +0000 (01:47 +0000)]
Merge "Use audio focus instead of music command broadcast" into gb-ub-photos-denali
Sascha Haeberling [Thu, 21 Nov 2013 21:52:15 +0000 (13:52 -0800)]
Introduce common services and integrate Refocus end-to-end.
Bug:
11120164
Bug:
10073814
This adds a new common CameraServices interface and a method to every
module to get it. Through this we can expose common services and due to
the interface, we can easily mock them for tests.
Also makes the MediaSaveService not a service anymore.
Change-Id: Ifa093efd4ba53c2955ccc2a990b4f18610c29944
Marco Nelissen [Tue, 29 Oct 2013 22:27:24 +0000 (15:27 -0700)]
Use audio focus instead of music command broadcast
Change-Id: I29066248c0145abed747f54c9bf4d93fdb76e45d
Erin Dahlgren [Thu, 21 Nov 2013 00:22:13 +0000 (00:22 +0000)]
Merge "Custom settings ui with dialogs." into gb-ub-photos-denali
Erin Dahlgren [Tue, 19 Nov 2013 18:53:49 +0000 (10:53 -0800)]
Custom settings ui with dialogs.
Change-Id: I117744135e5b08370c1feb63fe4abcccfe325659
Baligh Uddin [Wed, 20 Nov 2013 19:53:06 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7beb85c9a8f060eccccc5ca1302f6d5764d9cb79
Auto-generated-cl: translation import
Erin Dahlgren [Wed, 20 Nov 2013 00:40:14 +0000 (00:40 +0000)]
Merge "Initialize a global LocationManager." into gb-ub-photos-denali
Erin Dahlgren [Wed, 20 Nov 2013 00:37:38 +0000 (16:37 -0800)]
Initialize a global LocationManager.
Change-Id: I69f76e88f5e5b372bdcf6ba9fba8614e34595cc9
Angus Kong [Tue, 19 Nov 2013 00:17:43 +0000 (16:17 -0800)]
Centralize the module information.
Change-Id: I4d9fdbe480a518c7b6ca0268aa9beee49d22610c
Angus Kong [Tue, 19 Nov 2013 00:04:40 +0000 (00:04 +0000)]
Merge "Change capture request to pass a message." into gb-ub-photos-denali
OSDN Git Service
