OSDN Git Service
Kevin Gabayan [Thu, 19 Dec 2013 21:44:36 +0000 (21:44 +0000)]
Merge "Use Fused Location Provider when gms is available. Bug:
8295289" into gb-ub-photos-denali
Angus Kong [Thu, 19 Dec 2013 20:16:54 +0000 (12:16 -0800)]
Fix build.
Update LocalData implementations with new methods.
Change-Id: I9642dd2277d9e3d5745230fbee911cf03eb2905c
Angus Kong [Thu, 19 Dec 2013 20:03:36 +0000 (20:03 +0000)]
Merge "Load metadata of LocalData on demand." into gb-ub-photos-denali
Angus Kong [Thu, 19 Dec 2013 18:24:33 +0000 (10:24 -0800)]
Load metadata of LocalData on demand.
1. Metadata of LocalData is not always needed. It's more efficient to load it on
demand.
2. MetadataLoader added to be responsible for loading all the metadata.
3. Metadata loading callback added in LocalDataListener.
4. The loading of the metadata and the bitmap are now all executed by the thread
pool executor.
bug:
12216695
Change-Id: I5c75746630e9952b389f9b50416a0bb950301f33
Kevin Gabayan [Mon, 9 Dec 2013 19:41:50 +0000 (11:41 -0800)]
Use Fused Location Provider when gms is available.
Bug:
8295289
Change-Id: I3dba25c35fd3754ff70ed3ecea33052505274feb
Alan Newberger [Thu, 19 Dec 2013 17:21:53 +0000 (17:21 +0000)]
Merge "change gallery link placeholder in Camera2 to drawable from mipmap" into gb-ub-photos-denali
Baligh Uddin [Thu, 19 Dec 2013 15:25:34 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Thu, 19 Dec 2013 06:42:06 +0000 (22:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I03cf32f8a300125e13ba3279628d12e6f7769ad6
Auto-generated-cl: translation import
Sascha Haeberling [Thu, 19 Dec 2013 01:26:28 +0000 (17:26 -0800)]
Clean up unused imports.
Change-Id: If53a35571522c879304ac9af0ebfca79ed536be0
Alan Newberger [Thu, 19 Dec 2013 01:14:25 +0000 (17:14 -0800)]
change gallery link placeholder in Camera2 to drawable from mipmap
I believe latest mocks has this going away, using the full color
mipmap is not shippable anyway, and its breaking tests, so choosing
a drawable placeholder for now.
Change-Id: I2d23daf2a15935ea4b48fe99363722c5fdb6471a
Sascha Haeberling [Thu, 19 Dec 2013 01:04:18 +0000 (17:04 -0800)]
Advanced mode icon fix.
A recent CL accidentally switched the icon back to the craft icon.
Change-Id: I0f7d456daac85a22c565e530a2c3914f905b5b37
Angus Kong [Mon, 16 Dec 2013 23:02:34 +0000 (15:02 -0800)]
Refactor the photosphere/refocus metadata loading.
1. Metadata added to allow for different attributes to describe LocalData.
2. Move the metadata loading process to image data loading.
3. LocalData.view() removed. The invocation of external viewer is moved back to
the activity.
bug:
12197251
Change-Id: I496b018186f7a4b4818b976201703b966103a636
Spike Sprague [Wed, 18 Dec 2013 20:46:38 +0000 (12:46 -0800)]
unbreaking gcam build
Change-Id: I10a7bf25cc17bbf62b4f0ecd615606f7f3a57390
Spike Sprague [Wed, 18 Dec 2013 20:35:01 +0000 (20:35 +0000)]
Merge "adding new icon resources" into gb-ub-photos-denali
Spike Sprague [Wed, 18 Dec 2013 01:31:14 +0000 (17:31 -0800)]
adding new icon resources
bug:
12128194
Change-Id: I1b34100821113aa7ba996fab3faf14752e766030
Doris Liu [Wed, 18 Dec 2013 02:41:15 +0000 (18:41 -0800)]
Centralized TextureView transform logic
Automated transform matrix adjustment and bottom bar adjustment for
orientation or preview size change.
Bug:
12177718
Bug:
12179046
Change-Id: I4cd6fc90bb549774cfd83aaf8ac9654711a5c752
Spike Sprague [Sat, 14 Dec 2013 02:08:40 +0000 (18:08 -0800)]
video intent ui
Change-Id: I85e346274c51ec87e0d95e8e30f5c261f08f4d34
Sascha Haeberling [Tue, 17 Dec 2013 18:52:11 +0000 (10:52 -0800)]
Fix build by removing unused string.
Change-Id: I0f9c9648ca67697dc9af2f4a6f10270ed26c7d5e
Sascha Haeberling [Tue, 17 Dec 2013 18:35:54 +0000 (18:35 +0000)]
Merge "Change the mode switcher order, color, text." into gb-ub-photos-denali
Sascha Haeberling [Tue, 17 Dec 2013 18:01:11 +0000 (10:01 -0800)]
Change the mode switcher order, color, text.
Bug:
12179634
Bug:
12179736
Bug:
12180159
Also re-enable wide angle mode.
Change-Id: I075d7e2311fc560ed3d757585891c0eb2da08ea0
Angus Kong [Tue, 17 Dec 2013 18:12:07 +0000 (18:12 +0000)]
Merge "Launch activity through the controller." into gb-ub-photos-denali
Baligh Uddin [Tue, 17 Dec 2013 17:32:47 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Doris Liu [Tue, 17 Dec 2013 02:44:49 +0000 (18:44 -0800)]
Fix hdr+ preview wrong rotation
TextureView has accumulated OnLayoutChangeListener's over time: Modules
add a new listener to it when initialized, but never remove the listeners.
As a result, stale listeners are called when there is a layout change, and
consequently change the transform matrix incorrectly.
Bug:
12168516
Change-Id: I1aa77e682427ed074e8dc2d0574ea013e9e01fc6
Angus Kong [Mon, 16 Dec 2013 23:53:30 +0000 (15:53 -0800)]
Launch activity through the controller.
bug:
12173532
Change-Id: Ia99f53b6a5220c962f261ab598270d49366065ff
Doris Liu [Mon, 16 Dec 2013 23:00:12 +0000 (15:00 -0800)]
Fix HDR+ 100% view finder
Change-Id: I46fe8821ace8cc58a692bee83c162acd2e027c56
Spike Sprague [Mon, 16 Dec 2013 23:34:55 +0000 (23:34 +0000)]
Merge "prevent touch events on bottom control bar from triggering capture" into gb-ub-photos-denali
Angus Kong [Mon, 16 Dec 2013 23:26:51 +0000 (23:26 +0000)]
Merge "Reset zoomed view in filmstrip when after deletion" into gb-ub-photos-denali
Spike Sprague [Mon, 16 Dec 2013 23:24:37 +0000 (15:24 -0800)]
prevent touch events on bottom control bar from triggering capture
bug:
12138522
Change-Id: I041cacbcfa353864409d3d63acaa7bea6a69df59
Angus Kong [Mon, 16 Dec 2013 23:12:21 +0000 (23:12 +0000)]
Merge "Remove redundant call of onReload in FilmstripView" into gb-ub-photos-denali
Spike Sprague [Mon, 16 Dec 2013 22:55:14 +0000 (14:55 -0800)]
removing stray code tied to now defunct focus ring toggle
Change-Id: I76dcba650e189ed4b1fc6d83ce987fc2b0e9773d
Angus Kong [Mon, 16 Dec 2013 22:48:01 +0000 (14:48 -0800)]
Reset zoomed view in filmstrip when after deletion
bug:
11806155
Change-Id: Icd734dc9ad3b0821b90f28452256477bb0af4b40
Angus Kong [Mon, 16 Dec 2013 22:32:49 +0000 (14:32 -0800)]
Remove redundant call of onReload in FilmstripView
bug:
11136116
Change-Id: I1db0a4244589b594778454d8388d26a2990dbbbd
Erin Dahlgren [Mon, 16 Dec 2013 22:05:50 +0000 (22:05 +0000)]
Merge "Have the CameraAppUI manage refocus UI." into gb-ub-photos-denali
Baligh Uddin [Mon, 16 Dec 2013 20:59:00 +0000 (12:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I03509b212657c9750eae0ab9223e0e32b4e0484d
Auto-generated-cl: translation import
Spike Sprague [Mon, 16 Dec 2013 19:26:50 +0000 (19:26 +0000)]
Merge "removing FR and IMM debug toggle buttons" into gb-ub-photos-denali
Spike Sprague [Mon, 16 Dec 2013 19:18:01 +0000 (11:18 -0800)]
removing FR and IMM debug toggle buttons
bug:
12165442
Change-Id: Id188babfc8878ad06df4d774144851bf39e83cc2
Sascha Haeberling [Sat, 14 Dec 2013 09:08:38 +0000 (01:08 -0800)]
Fix bottom bar transparency issue in video mode.
Change-Id: Iafe1f3a863370cc5867074d3236e700f280213fb
Doris Liu [Sat, 14 Dec 2013 08:28:35 +0000 (08:28 +0000)]
Merge "Improve mode switch jank by reducing redundant transform matrix change" into gb-ub-photos-denali
Sascha Haeberling [Sat, 14 Dec 2013 08:21:10 +0000 (08:21 +0000)]
Merge "Fix secure camera." into gb-ub-photos-denali
Sascha Haeberling [Sat, 14 Dec 2013 08:19:50 +0000 (08:19 +0000)]
Merge "Clean up unused camera controls." into gb-ub-photos-denali
Sascha Haeberling [Sat, 14 Dec 2013 08:15:14 +0000 (00:15 -0800)]
Fix secure camera.
Let's not crash in memory manager when removing a listener that was not
added. This was to do with pause() being called twice in secure mode.
Instead just issue a warning.
Change-Id: I72ad41fd72c92e746d4972014f23ad0a86082b2d
Sascha Haeberling [Sat, 14 Dec 2013 07:28:30 +0000 (23:28 -0800)]
Clean up unused camera controls.
These are only used by LightCycle right now and will eventually
disappear completely when we introduce the new bottom bar.
Change-Id: I2e81db63b8f3602bc0be58edeef7017e91cad04b
Doris Liu [Sat, 14 Dec 2013 07:06:11 +0000 (23:06 -0800)]
Improve mode switch jank by reducing redundant transform matrix change
Change-Id: I2ab4167d9645fe9156a0be98d3e93fa179b8936f
Angus Kong [Sat, 14 Dec 2013 06:24:11 +0000 (22:24 -0800)]
Avoid double tapping the share button.
Might fire the share intent twice.
Change-Id: Ib4efb2302a2bee8fa6b9eaab6896fc75512734f3
Angus Kong [Sat, 14 Dec 2013 05:28:46 +0000 (05:28 +0000)]
Merge "Keep tracking the direction of swipe in filmstrip." into gb-ub-photos-denali
Angus Kong [Sat, 14 Dec 2013 02:25:22 +0000 (18:25 -0800)]
Keep tracking the direction of swipe in filmstrip.
bug:
12129544
Change-Id: I2950479d087af681e39a5d6df8b5907ed179886b
Sascha Haeberling [Sat, 14 Dec 2013 02:48:54 +0000 (18:48 -0800)]
Adding two comments missing from ag/399533.
Change-Id: I9413c11a33750f46f1f06ee8a175ee1231afc2d6
Sascha Haeberling [Sat, 14 Dec 2013 02:44:42 +0000 (02:44 +0000)]
Merge "Disable wideangle mode for the weekend build." into gb-ub-photos-denali
Sascha Haeberling [Sat, 14 Dec 2013 02:44:29 +0000 (02:44 +0000)]
Merge "Add placeholder image support." into gb-ub-photos-denali
Sascha Haeberling [Sat, 14 Dec 2013 02:31:39 +0000 (18:31 -0800)]
Disable wideangle mode for the weekend build.
The code is not ready yet for the extended fishfood.
Change-Id: I6e7fd7061f4b68a4270efcc4ac946d596bfa698c
Doris Liu [Sat, 14 Dec 2013 01:04:22 +0000 (17:04 -0800)]
Fix small flickering when starting mode drawer
Change-Id: Ie1775010527911933302b24b4296d7bffee9ff69
Doris Liu [Thu, 12 Dec 2013 02:39:14 +0000 (18:39 -0800)]
Mode selection animation
Change-Id: I3741f71add7e506a974602cefa6edfdbeb442fa0
Sascha Haeberling [Fri, 13 Dec 2013 21:29:58 +0000 (13:29 -0800)]
Add placeholder image support.
Bug:
12132677
Change-Id: I2add5837f82a956901c132cacae71b193007d482
Erin Dahlgren [Fri, 13 Dec 2013 23:52:30 +0000 (15:52 -0800)]
Have the CameraAppUI manage refocus UI.
Change-Id: I47bfd4a3b9e79ed0186cbac1c735d010b504362e
Doris Liu [Fri, 13 Dec 2013 23:35:13 +0000 (23:35 +0000)]
Merge "Flash animation parameter tweaking per latest spec" into gb-ub-photos-denali
Doris Liu [Fri, 13 Dec 2013 23:19:13 +0000 (15:19 -0800)]
Flash animation parameter tweaking per latest spec
Change-Id: I455878c4ce55ddd863e32487db1561e2ec759f69
Doris Liu [Fri, 13 Dec 2013 22:15:02 +0000 (22:15 +0000)]
Merge "Update Panorama mode name, color, icon" into gb-ub-photos-denali
Doris Liu [Fri, 13 Dec 2013 02:42:53 +0000 (18:42 -0800)]
Update Panorama mode name, color, icon
Bug:
12108651
Change-Id: I9edda88577702e41429a6845986e5d87c9abe3c7
Spike Sprague [Thu, 12 Dec 2013 19:14:27 +0000 (11:14 -0800)]
intent ui
Change-Id: I34c2b73a07d64b55b8aeb36515cae5d4e4e92813
Erin Dahlgren [Fri, 13 Dec 2013 01:36:32 +0000 (17:36 -0800)]
Add a flash callback for video mode toggle.
Bug:
12089860
Change-Id: I97941468f79b4fb39aefb6f0662a7540c6121abe
Sascha Haeberling [Fri, 13 Dec 2013 06:25:50 +0000 (06:25 +0000)]
Merge "Clean up and fix notifications." into gb-ub-photos-denali
Angus Kong [Fri, 13 Dec 2013 06:01:12 +0000 (22:01 -0800)]
Enable gallery button.
bug:
11898278
Change-Id: Id7953f5fa95a6597e5cd223094ab7ccb21f53e2c
Sascha Haeberling [Fri, 13 Dec 2013 04:11:09 +0000 (20:11 -0800)]
Clean up and fix notifications.
This fixes the issue where mutliple processes didn't properly create
their own notifications.
This also fixes the wording and messages for the notifications, which
are now always shown.
Change-Id: I829a80c8457e08fd6a3838393ef1080ef5fed433
Doris Liu [Thu, 12 Dec 2013 08:02:08 +0000 (00:02 -0800)]
New flash animation
Change-Id: I266b631a5c6feac114467e0a05799ad5e1ffae92
Erin Dahlgren [Fri, 13 Dec 2013 01:41:58 +0000 (01:41 +0000)]
Merge "Make hdr plus a global preference." into gb-ub-photos-denali
Erin Dahlgren [Fri, 13 Dec 2013 00:04:38 +0000 (16:04 -0800)]
Make hdr plus a global preference.
Bug:
12112662
Change-Id: I4d5b80aa2412982717bd66e4903deef5331a152b
Angus Kong [Thu, 12 Dec 2013 23:12:12 +0000 (23:12 +0000)]
Merge "Enable share from filmstrip." into gb-ub-photos-denali
Angus Kong [Thu, 12 Dec 2013 21:22:03 +0000 (13:22 -0800)]
Enable share from filmstrip.
bug:
11898278
Change-Id: I3c7986666cfcf05f87fa0c4a15024262afc2dc4f
Andy Huibers [Thu, 12 Dec 2013 21:33:28 +0000 (21:33 +0000)]
Merge "Implement new Zoom UI." into gb-ub-photos-denali
Spike Sprague [Thu, 12 Dec 2013 21:31:09 +0000 (21:31 +0000)]
Merge "fix simple camera not capturing bug" into gb-ub-photos-denali
Andy Huibers [Sun, 24 Nov 2013 16:47:33 +0000 (08:47 -0800)]
Implement new Zoom UI.
Change-Id: Ie390230dc85de9a9ba19d6e14e2e9f7f890c52d5
Angus Kong [Thu, 12 Dec 2013 04:51:01 +0000 (20:51 -0800)]
Move buttons from action bar to bottom.
Known issues:
1. Share has no effect.
2. Gallery icon has no effect.
bug:
11898278
Change-Id: I545e4dc339b6aa9242f61abb6021de874fcd3090
Spike Sprague [Thu, 12 Dec 2013 19:53:49 +0000 (11:53 -0800)]
fix simple camera not capturing bug
Change-Id: I9136b5f4f0738251ddb3cb97ebba150d7e0846f0
Spike Sprague [Thu, 12 Dec 2013 18:44:52 +0000 (18:44 +0000)]
Merge "unify preview and bottom bar resizing code move bottom bar button into own layout files" into gb-ub-photos-denali
Angus Kong [Thu, 12 Dec 2013 06:22:09 +0000 (06:22 +0000)]
Merge "Dim the background when filmstrip shows." into gb-ub-photos-denali
Angus Kong [Thu, 12 Dec 2013 04:59:39 +0000 (20:59 -0800)]
Dim the background when filmstrip shows.
bug:
11898278
Change-Id: I4bb4d89c3f22170044e20cd3c38364a9c063830f
Doris Liu [Thu, 12 Dec 2013 03:38:58 +0000 (19:38 -0800)]
Fix mode cover for hdr+ mode
Change-Id: Icb3c60946a6b5b280119e3a4d9c989ee6cc50e61
Angus Kong [Thu, 12 Dec 2013 02:14:13 +0000 (02:14 +0000)]
Merge "Fix the jitter by a stupid search-and-replace." into gb-ub-photos-denali
Spike Sprague [Wed, 11 Dec 2013 03:50:17 +0000 (19:50 -0800)]
unify preview and bottom bar resizing code
move bottom bar button into own layout files
Change-Id: Ib6237fddaa545476563b796cbd752b9562e9d9e4
Erin Dahlgren [Thu, 12 Dec 2013 01:59:03 +0000 (01:59 +0000)]
Merge "Refactor ProgressRenderer out of PieRenderer." into gb-ub-photos-denali
Angus Kong [Thu, 12 Dec 2013 01:46:34 +0000 (17:46 -0800)]
Fix the jitter by a stupid search-and-replace.
Change-Id: Id97b1ffe53cbb3a69d131f6069cb2cf4ca99a02f
Angus Kong [Thu, 12 Dec 2013 01:39:55 +0000 (01:39 +0000)]
Merge "A small refactor of ImageData and LocalData." into gb-ub-photos-denali
Erin Dahlgren [Wed, 11 Dec 2013 01:16:17 +0000 (17:16 -0800)]
Refactor ProgressRenderer out of PieRenderer.
* Depends on ag/397902
Change-Id: I7c5f46acae9eb3c57a67f3ddf01554f0faff082d
Sascha Haeberling [Fri, 22 Nov 2013 19:55:32 +0000 (11:55 -0800)]
Add a capture-session API to be used by all modules.
Bug:
11747284
This refactors the way we think of sessions. Instead of
having multiple session and notification APIs being used
by different modules, we create on central capture session
API to be used by all modules.
This also adds a first implementation of a Memory API which
tells modules about the current memory situation.
Change-Id: I7f030e32fc2f70f4007825ba7bbbdce9521a2bd9
Angus Kong [Wed, 11 Dec 2013 23:46:16 +0000 (15:46 -0800)]
A small refactor of ImageData and LocalData.
1. isPhoto() removed since it's for checking if we can edit it.
Use isDataActionSupported() instead since is designed for this purpose.
2. AuxInfoSupportCallback is moved to LocalData since filmstrip doesn't care
about this and it's only available on the local data.
Change-Id: I4eed477d6cdbe729904577b77a7ba97eed90074f
Angus Kong [Wed, 11 Dec 2013 06:58:15 +0000 (22:58 -0800)]
Refactor filmstrip BottomControls out of filmstrip
1. The control logic should stay in the controller instead of the view.
2. Fix various issues.
3. Remove some unnecessary hacky checks.
bug:
12089863
bug:
12095905
Change-Id: I6fceb5bf1a3121c45bc509f2fa96d01db2cedb5d
Doris Liu [Wed, 11 Dec 2013 00:34:08 +0000 (16:34 -0800)]
Show a camera theme cover until preview is ready
Also removed the toast for tap to take video snapshot
Change-Id: I85025a9d09842097403e5ea7ce7391ea0ed9ec98
Erin Dahlgren [Wed, 11 Dec 2013 20:15:40 +0000 (20:15 +0000)]
Merge "Gcam uses the PreviewStatusListener controlled by CameraAppUI." into gb-ub-photos-denali
Erin Dahlgren [Tue, 10 Dec 2013 22:53:35 +0000 (14:53 -0800)]
Gcam uses the PreviewStatusListener controlled by CameraAppUI.
Change-Id: I1c1a6fba0df6b2eef440e87e0f3d8f9313f8ee1a
Angus Kong [Wed, 11 Dec 2013 00:47:25 +0000 (00:47 +0000)]
Merge "Move/refactor filmstrip related files around." into gb-ub-photos-denali
Angus Kong [Tue, 10 Dec 2013 19:06:18 +0000 (11:06 -0800)]
Move/refactor filmstrip related files around.
1. Rename filmstrip.FilmstripDataAdapter to filmstrip.DataAdapter.
2. Rename filmstrip.FilmstripImageData to filmstrip.ImageData.
3. Move filmstrip.FilmstripListener to filmstrip.FilmstripController.Listener.
4. Add FilmstripContentPanel interface.
5. Move ui.FilmstripView to widget.FilmstripView
6. Move ui.FilmstrpLayout to widget.Filmstripview
7. Move ui.FilmstripBottomControls to widget.FilmstripBottomLayout
8. Extracted interface from widget.FilmstripBottomLayout as
filmstrip.BottomControls
Change-Id: I83bdd89e2a48a98002a4fed7dab011b28036d1a0
Sascha Haeberling [Tue, 10 Dec 2013 22:32:03 +0000 (22:32 +0000)]
Merge "Don't show tap-to-focus message." into gb-ub-photos-denali
Erin Dahlgren [Tue, 10 Dec 2013 21:19:35 +0000 (13:19 -0800)]
Support continous zoom ranges in PreviewOverlay.
Change-Id: I46ee4f515ef159bbd2018dde43310c0327fa6e48
Sascha Haeberling [Tue, 10 Dec 2013 20:18:56 +0000 (12:18 -0800)]
Don't show tap-to-focus message.
Bug:
12028253
Change-Id: Ifc4385c177dd895f2959429e2575d3ef1d5fcfe3
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
OSDN Git Service
