OSDN Git Service
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 [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 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
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
Erin Dahlgren [Fri, 3 Jan 2014 00:08:12 +0000 (16:08 -0800)]
Update camera parameters when setting has changed.
Bug:
12250474
* Implemented for photo mode only.
* To be extended to all other modules.
Change-Id: Ie5218f3a76acb757ac526d3f987ef3165736b46d
Angus Kong [Fri, 3 Jan 2014 02:09:27 +0000 (18:09 -0800)]
Remove unused code in PhotoModule.
Change-Id: I28611ab68343effffab8b8a00649e5884472fc8a
Doris Liu [Fri, 3 Jan 2014 01:40:12 +0000 (17:40 -0800)]
Center preview UI in the live preview rect
Center flash animation
Center zoom animation
Center focus indicator for auto focus
TODO: Gcam focus indicator is not centered in the live preview
Bug:
12114128
Change-Id: I5e7f79fdf6a705789d995fc3bf3570262bc8bb49
Angus Kong [Fri, 3 Jan 2014 00:00:49 +0000 (16:00 -0800)]
Check filmstrip visibility to pass down key events
bug:
12196741
Change-Id: I7ef5c65060b4c5481adc41f45f47f9c817f3a8b6
Baligh Uddin [Fri, 27 Dec 2013 00:56:54 +0000 (16:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8a2e9e5d0a38df978583a88c089afff29823ceb6
Auto-generated-cl: translation import
Sascha Häberling [Sat, 21 Dec 2013 21:46:06 +0000 (21:46 +0000)]
Merge "Temp fix the crash going out of photosphere" into gb-ub-photos-denali
Doris Liu [Sat, 21 Dec 2013 19:32:28 +0000 (11:32 -0800)]
Part II of ag/401462
Change-Id: I569179e712d5c4d690a815a16dde31240c396b7f
Doris Liu [Thu, 19 Dec 2013 03:18:16 +0000 (19:18 -0800)]
Touch to focus
Change-Id: I69860bd05426e3a04bc5fd7d0dd581b5d6ff768d
Doris Liu [Sat, 21 Dec 2013 03:53:01 +0000 (19:53 -0800)]
Temp fix the crash going out of photosphere
Change-Id: I88cc9619a6057e9984d091ea9c92d80209df8cb5
Kevin Gabayan [Sat, 21 Dec 2013 01:45:55 +0000 (17:45 -0800)]
Fallback to Legacy location provider upon connection failure (Camera2)
Change-Id: Ibeea4802a93a76c02ea8f6f7558f2d49fbbfe41b
Spike Sprague [Sat, 21 Dec 2013 01:08:46 +0000 (01:08 +0000)]
Merge "removing unneeded member variable" into gb-ub-photos-denali
Seth Raphael [Sat, 21 Dec 2013 01:08:34 +0000 (01:08 +0000)]
Merge "Allow capture during accordion shimmy" into gb-ub-photos-denali
Spike Sprague [Sat, 21 Dec 2013 01:08:09 +0000 (17:08 -0800)]
removing unneeded member variable
Change-Id: I856b291cd7216c606ee937379d78ce21d54fdd30
Sascha Haeberling [Sat, 21 Dec 2013 00:50:33 +0000 (00:50 +0000)]
Merge "Two new getters for the session API." into gb-ub-photos-denali
Sascha Haeberling [Sat, 21 Dec 2013 00:45:53 +0000 (16:45 -0800)]
Two new getters for the session API.
Bug:
12236950
Change-Id: I1ac8809688e48ffa4cbde16c212fb90e1a1e5c01
Spike Sprague [Sat, 21 Dec 2013 00:35:20 +0000 (00:35 +0000)]
Merge "disabling swipe gestures for capture intents" into gb-ub-photos-denali
Erin Dahlgren [Sat, 21 Dec 2013 00:31:29 +0000 (00:31 +0000)]
Merge "New Capture UI." into gb-ub-photos-denali
Andy Huibers [Sat, 21 Dec 2013 00:27:52 +0000 (00:27 +0000)]
Merge "Increase bitmap resolution when zooming in filmstrip" into gb-ub-photos-denali
Seth Raphael [Sat, 21 Dec 2013 00:23:15 +0000 (16:23 -0800)]
Allow capture during accordion shimmy
Change-Id: I0027bf1c138efb67b1b2c9bc6599cb2a837c0caf
Erin Dahlgren [Wed, 18 Dec 2013 02:31:35 +0000 (18:31 -0800)]
New Capture UI.
* depends on ag/400799
Change-Id: Ieb0e27447659bcb04dee57348583f68d680408d2
Spike Sprague [Fri, 20 Dec 2013 01:05:45 +0000 (17:05 -0800)]
disabling swipe gestures for capture intents
Change-Id: I65ac74ac855fe3ee95339a29aecdab1fe74e4659
Andy Huibers [Fri, 13 Dec 2013 23:53:43 +0000 (15:53 -0800)]
Increase bitmap resolution when zooming in filmstrip
Bug:
11137777
Change-Id: I6f947e2981d012c1693ef0475a2776a7e6275de5
Sascha Haeberling [Fri, 20 Dec 2013 19:59:35 +0000 (11:59 -0800)]
Simplify the LocalData API.
By removing the Context from most method calls, it makes the
API much more concise and focus on what's important.
Change-Id: Ib79344365bd4d6a33f8ef59d1d28b5e9780102f5
Doris Liu [Fri, 20 Dec 2013 21:40:03 +0000 (21:40 +0000)]
Merge "Hook up with camera for accurate timing of new frame" into gb-ub-photos-denali
Sascha Haeberling [Fri, 20 Dec 2013 20:33:44 +0000 (12:33 -0800)]
Change naming to reflect that it's 'allowed' memory.
... and not current usage.
Change-Id: Ifcbdf95c33112d74cb6a21f66a079ad0d6e7ebd5
Doris Liu [Fri, 20 Dec 2013 02:55:54 +0000 (18:55 -0800)]
Hook up with camera for accurate timing of new frame
TextureView's onSurfaceTextureChanged callback has been proved
inaccurate in terms of timing for new frame, which contradicts
the documentation. Nevertheless, we need accurate timing to
ensure smooth mode change.
Bug:
11963674
Bug:
11767246
Change-Id: I8673174ac5e191c0ab7c4377ff81b3e0889f8831
Sascha Haeberling [Fri, 20 Dec 2013 19:41:40 +0000 (11:41 -0800)]
Implement the method to determine our max native memory usage.
Bug:
12246801
Change-Id: I5af99bd802be090df9e4c7f909de8e2ca3600f40
Spike Sprague [Fri, 20 Dec 2013 18:01:59 +0000 (18:01 +0000)]
Merge "removing *_disabled.png assets for mode icons" into gb-ub-photos-denali
Doris Liu [Fri, 20 Dec 2013 03:07:58 +0000 (19:07 -0800)]
Hide mode drawer when back is pressed
Bug:
12105158
Change-Id: I0c17fe979e732dad465798ea647d90fb30077c26
Spike Sprague [Fri, 20 Dec 2013 01:23:28 +0000 (17:23 -0800)]
removing *_disabled.png assets for mode icons
bug:
12234456
Change-Id: I978e0f43c3ca3bf5dfd5198a9c45048299b43c0e
Angus Kong [Fri, 20 Dec 2013 00:31:37 +0000 (16:31 -0800)]
Fix wrong decoding due to parallel execution.
Change-Id: I8d38eb57ce3b35d0747be07a23fc80fc06fff600
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