OSDN Git Service
Sascha Haeberling [Tue, 8 Apr 2014 02:58:43 +0000 (02:58 +0000)]
am
298d4548: Merge "Switch visibility on AbstractTutorialOverlay removeOverlay." into gb-ub-photos-denali
* commit '
298d45483448de4493abadca286bba4eccab44ae':
Switch visibility on AbstractTutorialOverlay removeOverlay.
Sascha Haeberling [Tue, 8 Apr 2014 02:53:52 +0000 (02:53 +0000)]
Merge "Switch visibility on AbstractTutorialOverlay removeOverlay." into gb-ub-photos-denali
Sascha Haeberling [Tue, 8 Apr 2014 01:40:33 +0000 (18:40 -0700)]
Switch visibility on AbstractTutorialOverlay removeOverlay.
Bug:
13337436
Bug:
12440059
Change-Id: I34dd96df02cedf33be72ae5563bbad3d4b307a12
Baligh Uddin [Tue, 8 Apr 2014 02:24:20 +0000 (02:24 +0000)]
am
bdb4f61d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
* commit '
bdb4f61da7be41f2535e0bdc08225263c037be90':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:20:51 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Tue, 8 Apr 2014 02:20:45 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Alan Newberger [Tue, 8 Apr 2014 01:37:55 +0000 (01:37 +0000)]
am
0d4570a2: Merge "Replace isDebugging compiletime logging override with runtime property" into gb-ub-photos-denali
* commit '
0d4570a241f3e2505fa66fb81b4c297a3c1d4d09':
Replace isDebugging compiletime logging override with runtime property
Sascha Haeberling [Tue, 8 Apr 2014 01:37:54 +0000 (01:37 +0000)]
am
829c8e92: Merge "Don\'t show the tutorial wrapper all the time." into gb-ub-photos-denali
* commit '
829c8e929949e1951b1562ef97cf447b02dcef45':
Don't show the tutorial wrapper all the time.
Alan Newberger [Tue, 8 Apr 2014 01:25:12 +0000 (01:25 +0000)]
Merge "Replace isDebugging compiletime logging override with runtime property" into gb-ub-photos-denali
Sascha Haeberling [Tue, 8 Apr 2014 01:10:53 +0000 (01:10 +0000)]
Merge "Don't show the tutorial wrapper all the time." into gb-ub-photos-denali
Sascha Haeberling [Tue, 8 Apr 2014 01:06:59 +0000 (18:06 -0700)]
Don't show the tutorial wrapper all the time.
Bug:
13337436
Bug:
12440059
Change-Id: I10a969a4c550b6ebbc101f7cdce8ef12c3029137
Alan Newberger [Tue, 8 Apr 2014 01:03:08 +0000 (18:03 -0700)]
Replace isDebugging compiletime logging override with runtime property
This CL accomplishes the same goal as the compile-time isDebuggable,
with a runtime property check. This is useful so that we opt in to
logging everything at a given level with one setprop line.
Note that either with this new runtime property or with isDebuggable,
the Log proxy wouldn't log if a particular Configuration value is false,
since that level is instead routed to SILENT_LOGGER.
Bug:
13737123
Change-Id: I78ce629620f420a08a2cc013865847674941fb9b
Sascha Haeberling [Tue, 8 Apr 2014 00:45:28 +0000 (00:45 +0000)]
am
13cdf16b: Merge "Make tutorials render in smaller layout on tablets." into gb-ub-photos-denali
* commit '
13cdf16bee5a46d20266a60230239a49cd0f22ac':
Make tutorials render in smaller layout on tablets.
Sascha Haeberling [Tue, 8 Apr 2014 00:42:06 +0000 (00:42 +0000)]
Merge "Make tutorials render in smaller layout on tablets." into gb-ub-photos-denali
Sascha Haeberling [Tue, 8 Apr 2014 00:29:44 +0000 (17:29 -0700)]
Make tutorials render in smaller layout on tablets.
Bug:
13337436
Bug:
12440059
Change-Id: I7886a86189a94483775a5535c69e22090cec1530
Alan Newberger [Tue, 8 Apr 2014 00:25:13 +0000 (00:25 +0000)]
am
81e56a9f: Shorten ExternalViewerButton log
* commit '
81e56a9f6de8935a1200aafaaa6858662559517f':
Shorten ExternalViewerButton log
Alan Newberger [Tue, 8 Apr 2014 00:16:48 +0000 (17:16 -0700)]
Shorten ExternalViewerButton log
While examining logs, noticed our Log proxy rejected this log line
as too long.
Bug:
13737123
Change-Id: I8ca2cf6be79539db0fd262ffd13a317f6fe20dcb
Doris Liu [Mon, 7 Apr 2014 23:24:55 +0000 (23:24 +0000)]
am
77da836f: Merge "Hide mode switcher in selected state when window is no longer visible" into gb-ub-photos-denali
* commit '
77da836f524dbbf7fe92ff1ca6147595a540246f':
Hide mode switcher in selected state when window is no longer visible
Doris Liu [Mon, 7 Apr 2014 23:20:05 +0000 (23:20 +0000)]
Merge "Hide mode switcher in selected state when window is no longer visible" into gb-ub-photos-denali
Doris Liu [Mon, 7 Apr 2014 22:45:17 +0000 (15:45 -0700)]
Hide mode switcher in selected state when window is no longer visible
Bug:
13751149
Change-Id: Id479eeed06ec8965df2836c4825de6212c7efa7a
Alan Newberger [Mon, 7 Apr 2014 22:45:40 +0000 (22:45 +0000)]
am
bd90f35e: Migrate LocationManager to use camera Logger
* commit '
bd90f35edda63c039a68f24e647b3ce60a9622cd':
Migrate LocationManager to use camera Logger
Alan Newberger [Mon, 7 Apr 2014 22:18:43 +0000 (15:18 -0700)]
Migrate LocationManager to use camera Logger
This is the last remaining non-test class in Camera2 using
android.util.Log directly.
Bug:
13737123
Change-Id: Ia90d1d91b651cace026d9fdd5867d556aa8bad72
Baligh Uddin [Mon, 7 Apr 2014 19:34:37 +0000 (12:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9fc8cd274bebccb0a39426246e9384cc9e018854
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:33:12 +0000 (12:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2331700a1214d9a3518ef60cae0d454301e25788
Auto-generated-cl: translation import
Sascha Haeberling [Mon, 7 Apr 2014 19:29:29 +0000 (19:29 +0000)]
am
71c43b6f: Merge "Make removeOverlay publicly available." into gb-ub-photos-denali
* commit '
71c43b6f062ced7cf239dc506718cf0825665b67':
Make removeOverlay publicly available.
Sascha Haeberling [Mon, 7 Apr 2014 19:24:54 +0000 (19:24 +0000)]
Merge "Make removeOverlay publicly available." into gb-ub-photos-denali
Doris Liu [Mon, 7 Apr 2014 19:20:22 +0000 (19:20 +0000)]
am
90d61209: Merge "Resize mode drawer content for tablet to 1.5x of that on phones" into gb-ub-photos-denali
* commit '
90d61209c885f2c570cb00ef505f8ccdf54eb627':
Resize mode drawer content for tablet to 1.5x of that on phones
Andy Huibers [Mon, 7 Apr 2014 19:20:22 +0000 (19:20 +0000)]
am
937a2fc8: Remove unneeded log line.
* commit '
937a2fc8c2694353692a122dddd658754bd67cb6':
Remove unneeded log line.
Doris Liu [Mon, 7 Apr 2014 19:17:08 +0000 (19:17 +0000)]
Merge "Resize mode drawer content for tablet to 1.5x of that on phones" into gb-ub-photos-denali
Andy Huibers [Mon, 7 Apr 2014 18:59:05 +0000 (11:59 -0700)]
Remove unneeded log line.
Change-Id: Ibf22b2389ed898f68f7f9217f0d899dfae8aa767
Doris Liu [Mon, 7 Apr 2014 18:30:47 +0000 (11:30 -0700)]
Resize mode drawer content for tablet to 1.5x of that on phones
Bug:
13768342
Change-Id: I4c9017b9f003d5093e7153bf31a378d818caf788
Doris Liu [Mon, 7 Apr 2014 16:46:18 +0000 (16:46 +0000)]
am
f4d5afbc: Merge "Workaround for black sqaure issue caused by incorrectly recreated HW layer" into gb-ub-photos-denali
* commit '
f4d5afbcdc31165caef741aa7c06371b01c91b45':
Workaround for black sqaure issue caused by incorrectly recreated HW layer
Doris Liu [Mon, 7 Apr 2014 16:40:45 +0000 (16:40 +0000)]
Merge "Workaround for black sqaure issue caused by incorrectly recreated HW layer" into gb-ub-photos-denali
Spike Sprague [Mon, 7 Apr 2014 16:40:06 +0000 (16:40 +0000)]
am
abf54e29: exposure compensation control is back
* commit '
abf54e2994961395a0feb0b08353e62718443f23':
exposure compensation control is back
Seth Raphael [Mon, 7 Apr 2014 04:38:22 +0000 (04:38 +0000)]
am
3cd228a2: Merge "Fix Settings Activity" into gb-ub-photos-denali
* commit '
3cd228a2cce5ec89ddedd52d88fa5488e0e47bd9':
Fix Settings Activity
Erin Dahlgren [Mon, 7 Apr 2014 04:38:20 +0000 (04:38 +0000)]
am
00b04884: Merge "Make the camera id setting have static possible values." into gb-ub-photos-denali
* commit '
00b04884a4f857ad5d34247c0ad1bed1cb4a164c':
Make the camera id setting have static possible values.
Seth Raphael [Mon, 7 Apr 2014 04:38:19 +0000 (04:38 +0000)]
am
224b97cb: Merge "Add context to parameters passed to ExtraSettings" into gb-ub-photos-denali
* commit '
224b97cbde1ca050e8e74d34ba7c2f8046142fd4':
Add context to parameters passed to ExtraSettings
Sascha Haeberling [Mon, 7 Apr 2014 04:38:18 +0000 (04:38 +0000)]
am
70f20249: Merge "Add resources for tutorials." into gb-ub-photos-denali
* commit '
70f2024930b66854724b205badedd2ba71196106':
Add resources for tutorials.
Andy Huibers [Mon, 7 Apr 2014 04:38:18 +0000 (04:38 +0000)]
am
b5b2e4a7: Merge "Fix hdr check." into gb-ub-photos-denali
* commit '
b5b2e4a762db8a8608df0508312d5329ddd243f9':
Fix hdr check.
Andy Huibers [Mon, 7 Apr 2014 04:38:17 +0000 (04:38 +0000)]
am
68e10629: Merge "Use only filename from path as reference." into gb-ub-photos-denali
* commit '
68e106296a350b8f0f0c8d6efde1545dca59b623':
Use only filename from path as reference.
Baligh Uddin [Mon, 7 Apr 2014 04:38:16 +0000 (04:38 +0000)]
am
30334b09: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
* commit '
30334b09b30c9df4d675738c55c931274021d1a8':
Import translations. DO NOT MERGE
Sascha Haeberling [Mon, 7 Apr 2014 04:27:00 +0000 (21:27 -0700)]
resolved conflicts for merge of
0bfc7619 to ub-camera-everglades
Change-Id: Id95979da7701d52f1c25ddba710686465a8ba60d
Doris Liu [Mon, 7 Apr 2014 04:09:47 +0000 (04:09 +0000)]
am
76aaa187: Fix layout error during mode switch
* commit '
76aaa1870d77856c975283392d3a0fea3e1fb7ba':
Fix layout error during mode switch
Sascha Haeberling [Mon, 7 Apr 2014 04:06:41 +0000 (21:06 -0700)]
resolved conflicts for merge of
79dd6876 to ub-camera-everglades
Change-Id: Icba83583ffb5b6210ec084ca7e3193bedebe7da1
Doris Liu [Mon, 7 Apr 2014 04:04:34 +0000 (04:04 +0000)]
am
7933feb7: Fix for visibilty of cling out of sync with the external viewer button
* commit '
7933feb7d1bbb0342061584f623bb239266f5d91':
Fix for visibilty of cling out of sync with the external viewer button
Angus Kong [Mon, 7 Apr 2014 04:04:27 +0000 (04:04 +0000)]
am
c9638388: Merge "Add API to query the current auto-rotation setting" into gb-ub-photos-denali
* commit '
c9638388b28c9eca448bb4279c0f2f519c6d342e':
Add API to query the current auto-rotation setting
Sascha Haeberling [Mon, 7 Apr 2014 04:04:26 +0000 (04:04 +0000)]
am
39675164: Turn Lights-Out mode back on.
* commit '
396751645d19012eec4fe1d94023c6b474f9fb91':
Turn Lights-Out mode back on.
Sascha Haeberling [Mon, 7 Apr 2014 04:04:25 +0000 (04:04 +0000)]
am
3d022031: Merge "Remove unused ComboPreferences cruft." into gb-ub-photos-denali
* commit '
3d02203136fe7955f77529828756de9ebaf163dc':
Remove unused ComboPreferences cruft.
Seth Raphael [Mon, 7 Apr 2014 04:04:24 +0000 (04:04 +0000)]
am
d3d78999: Avoid a race condition causing dup\'d images.
* commit '
d3d789992f96e4598521a27f085d185044ec7cee':
Avoid a race condition causing dup'd images.
Seth Raphael [Mon, 7 Apr 2014 04:04:23 +0000 (04:04 +0000)]
am
59efb9af: When we reset app ui, re-enable shutter button.
* commit '
59efb9af8340a5e3500037b23fb3ac16011a1c7e':
When we reset app ui, re-enable shutter button.
Seth Raphael [Mon, 7 Apr 2014 04:04:23 +0000 (04:04 +0000)]
am
55d5b4a6: Merge "Fix crash related to deleted items being processed" into gb-ub-photos-denali
* commit '
55d5b4a6a892b9c6265b2b6e43102396a6123493':
Fix crash related to deleted items being processed
Erin Dahlgren [Mon, 7 Apr 2014 04:04:22 +0000 (04:04 +0000)]
am
3578a8d9: Merge "Move disk IO from first time use background task." into gb-ub-photos-denali
* commit '
3578a8d937f1265eca854f82d9305a0d4a4259a0':
Move disk IO from first time use background task.
Sascha Haeberling [Mon, 7 Apr 2014 04:03:31 +0000 (21:03 -0700)]
resolved conflicts for merge of
fed27f98 to ub-camera-everglades
Change-Id: I772dce9ec63a3c60fd4a72b50460ef89dda06338
Erin Dahlgren [Mon, 7 Apr 2014 03:43:03 +0000 (03:43 +0000)]
am
45810372: Merge "Fix broken shutter button enabling in Photo and Video." into gb-ub-photos-denali
* commit '
458103727c23134f3c9fb678dd757f31779f6db8':
Fix broken shutter button enabling in Photo and Video.
Sascha Haeberling [Mon, 7 Apr 2014 03:43:02 +0000 (03:43 +0000)]
am
94dea6e4: Merge "Refactor UsageStatistic so it can be disabled more easily." into gb-ub-photos-denali
* commit '
94dea6e4d1744aeaa5001a5023fb0a7ecb124128':
Refactor UsageStatistic so it can be disabled more easily.
Sascha Haeberling [Sat, 5 Apr 2014 08:46:00 +0000 (01:46 -0700)]
Make removeOverlay publicly available.
Bug:
13337436
Change-Id: I222f3353230ad734db304f2068f853bdf8ef9de3
Spike Sprague [Thu, 27 Mar 2014 22:41:28 +0000 (15:41 -0700)]
exposure compensation control is back
bug:
13607051
Change-Id: Ib4920ba3f8f3a548651a2d07613ccfdc28ca1d6e
Doris Liu [Sat, 5 Apr 2014 02:24:34 +0000 (19:24 -0700)]
Workaround for black sqaure issue caused by incorrectly recreated HW layer
Bug:
12594617
Change-Id: I9209d4bc0d6ebd045b957b3c79eabdca0a4f7cc4
Seth Raphael [Fri, 4 Apr 2014 23:55:55 +0000 (23:55 +0000)]
Merge "Fix Settings Activity" into gb-ub-photos-denali
Seth Raphael [Fri, 4 Apr 2014 23:42:20 +0000 (16:42 -0700)]
Fix Settings Activity
Bug:
13817516
Change-Id: Idb8b95c3501b52519ae97b6d603ee59e8cc50ce4
Erin Dahlgren [Fri, 4 Apr 2014 17:30:42 +0000 (17:30 +0000)]
Merge "Make the camera id setting have static possible values." into gb-ub-photos-denali
Seth Raphael [Fri, 4 Apr 2014 17:28:43 +0000 (17:28 +0000)]
Merge "Add context to parameters passed to ExtraSettings" into gb-ub-photos-denali
Seth Raphael [Thu, 3 Apr 2014 23:34:45 +0000 (16:34 -0700)]
Add context to parameters passed to ExtraSettings
Bug:
13791528
Change-Id: Ibcc4db1ab07b274f18f1ab369747d759180f155b
Sascha Haeberling [Fri, 4 Apr 2014 16:03:57 +0000 (16:03 +0000)]
Merge "Add resources for tutorials." into gb-ub-photos-denali
Andy Huibers [Fri, 4 Apr 2014 15:45:35 +0000 (15:45 +0000)]
Merge "Fix hdr check." into gb-ub-photos-denali
Andy Huibers [Fri, 4 Apr 2014 06:23:29 +0000 (23:23 -0700)]
Fix hdr check.
Change-Id: I7ebd06a985fbc0661d71b189fe1fdbf620f1c341
Andy Huibers [Fri, 4 Apr 2014 15:29:48 +0000 (15:29 +0000)]
Merge "Use only filename from path as reference." into gb-ub-photos-denali
Baligh Uddin [Fri, 4 Apr 2014 14:35:15 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Fri, 4 Apr 2014 14:35:08 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Erin Dahlgren [Fri, 4 Apr 2014 06:32:02 +0000 (23:32 -0700)]
Make the camera id setting have static possible values.
This is important because the dynamic hook for querying the
supported number of cameras is currently only based on the camera 1 api.
We want to make sure we can set the enabled/disabled state of back
and front facing camera in the mode options, so it's necessasry to
always have both possible values.
Bug:
13769609
Change-Id: I9d526315dbe15e008542832f9b2c4c9d23d34021
Andy Huibers [Fri, 4 Apr 2014 05:32:46 +0000 (22:32 -0700)]
Use only filename from path as reference.
Change-Id: Ifa3dd1a8c89cab5b135953eebca70f4ed53c1102
Andy Huibers [Fri, 4 Apr 2014 01:40:22 +0000 (01:40 +0000)]
Merge "Logging revisions." into gb-ub-photos-denali
Andy Huibers [Sat, 29 Mar 2014 21:06:54 +0000 (14:06 -0700)]
Logging revisions.
Bug:
13747555
Change-Id: Ic5f735de89f9a69d981cdeab209b3966532697c7
Doris Liu [Thu, 3 Apr 2014 22:59:00 +0000 (15:59 -0700)]
Fix layout error during mode switch
Cause for the incorrect layout: the two modes have a preview
of the same aspect ratio, and therefore bottom bar did not need to re-layout
after the mode switch and it incidentally skipped adjusting preview position.
Bug:
13210080
Change-Id: Iad722abd682885633885ff0e8d9fba4efb4e5e6a
Sascha Haeberling [Thu, 3 Apr 2014 19:48:02 +0000 (19:48 +0000)]
Merge "Move SettingsManager back into Activity." into gb-ub-photos-denali
Doris Liu [Thu, 3 Apr 2014 18:28:43 +0000 (11:28 -0700)]
Fix for visibilty of cling out of sync with the external viewer button
Due to no visiblity changed listener provided from Framework, a subclass
of the image button was created to track the visiblity change of itself
and more importantly its ancesters. This way cling is gauranteed to be
in sync with the visility of the button.
Also fixed preference type of showing refocus viewer cling.
Bug:
13754204
Bug:
13752484
Change-Id: Iaf38c076d5b1e251f3d5d4b4ccba1bd8447999aa
Sascha Haeberling [Thu, 3 Apr 2014 06:27:50 +0000 (23:27 -0700)]
Move SettingsManager back into Activity.
We cannot easily share one instance between Activities as the manager
needs the current module index. So this can cause crashes if two
Activity instances are around and one gets destroyed.
Change-Id: I964b14460669c4fbe3a51ab80cd385d5dfa0a16d
Angus Kong [Thu, 3 Apr 2014 02:49:32 +0000 (02:49 +0000)]
Merge "Add API to query the current auto-rotation setting" into gb-ub-photos-denali
Sascha Haeberling [Thu, 3 Apr 2014 01:16:42 +0000 (18:16 -0700)]
Turn Lights-Out mode back on.
Bug:
13765919
This is reverting http://ag/436107
Change-Id: Id40645f2555d3133b0e866de57c8c951d8c3b86d
Sascha Haeberling [Wed, 2 Apr 2014 23:32:42 +0000 (23:32 +0000)]
Merge "Remove unused ComboPreferences cruft." into gb-ub-photos-denali
Sascha Haeberling [Wed, 2 Apr 2014 23:25:03 +0000 (16:25 -0700)]
Remove unused ComboPreferences cruft.
Change-Id: Ib2e005e00316f8840e29fb559e34c6a5d9f28950
Sascha Haeberling [Wed, 2 Apr 2014 22:51:02 +0000 (15:51 -0700)]
Add resources for tutorials.
Bug:
13337436
Change-Id: I51eeb1def89d4bb0c0e6388454f65ca43d4afbb9
Seth Raphael [Wed, 2 Apr 2014 21:43:39 +0000 (14:43 -0700)]
Avoid a race condition causing dup'd images.
When a session is finished, it is written to the
media store.
We now have a listener looking for new images in
the media store. If that happens to fire before
the session manager has updated the filmstrip,
the photo ends up being added twice.
Now, the listener checks to see if it is a photo
already being handled by a session
Bug:
13644124
Change-Id: I8a3c4a161ad0c326d9295f6714f6c6cbbcc6764e
Seth Raphael [Wed, 2 Apr 2014 21:46:03 +0000 (14:46 -0700)]
When we reset app ui, re-enable shutter button.
This allows all modules to have a known state on
resume.
Change-Id: I8efab600b7c6df611e522bb20c8a164006a27a9d
Seth Raphael [Wed, 2 Apr 2014 20:45:15 +0000 (20:45 +0000)]
Merge "Fix crash related to deleted items being processed" into gb-ub-photos-denali
Seth Raphael [Wed, 2 Apr 2014 00:32:42 +0000 (17:32 -0700)]
Fix crash related to deleted items being processed
If an item from the media store was being edited
there is a race condition where the item may be
deleted from the media store before it is finished
The resulting update to the media store cannot
find the original item, and therefore results in
0 rows being updated, which is what is desired,
as the item was deleted by the user.
Bug:
11598186
Change-Id: I1b2945f638676ccd63ab70ba201d2488df920eb3
Baligh Uddin [Wed, 2 Apr 2014 19:18:21 +0000 (12:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8818eba0245d483336ebc9d76f3c8070079bb683
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Apr 2014 19:16:53 +0000 (12:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic0dc01915c9a7fb61857cd2d5bb970a49cd720d1
Auto-generated-cl: translation import
Erin Dahlgren [Wed, 2 Apr 2014 17:47:21 +0000 (17:47 +0000)]
Merge "Move disk IO from first time use background task." into gb-ub-photos-denali
Sascha Haeberling [Wed, 2 Apr 2014 17:31:21 +0000 (17:31 +0000)]
Merge "Make SettingsManager accessible on app-level, not Activity-level." into gb-ub-photos-denali
Doris Liu [Wed, 2 Apr 2014 16:54:02 +0000 (16:54 +0000)]
am
86f71de1: Merge "Fix capture button layout for RTL" into gb-ub-photos-denali
* commit '
86f71de115a1a7771d5505e10bce0262bc7093ba':
Fix capture button layout for RTL
Doris Liu [Wed, 2 Apr 2014 16:54:01 +0000 (16:54 +0000)]
am
14320b47: Merge "Temp swipe interception to support swipe from capture button" into gb-ub-photos-denali
* commit '
14320b47a88a818b6cc341f4a15c294e28ef1dfe':
Temp swipe interception to support swipe from capture button
Spike Sprague [Wed, 2 Apr 2014 16:54:01 +0000 (16:54 +0000)]
am
6446567c: Merge "properly resize capture flash anim overlay" into gb-ub-photos-denali
* commit '
6446567c51f99c500d4fff16052586495605a33d':
properly resize capture flash anim overlay
Erin Dahlgren [Wed, 2 Apr 2014 16:51:27 +0000 (16:51 +0000)]
Merge "Fix broken shutter button enabling in Photo and Video." into gb-ub-photos-denali
Erin Dahlgren [Wed, 2 Apr 2014 16:48:42 +0000 (09:48 -0700)]
resolved conflicts for merge of
3c4f7abe to ub-camera-everglades
Change-Id: Ia618681d2bfd3ceb928f47f2b706b83eea2f93d1
Angus Kong [Wed, 2 Apr 2014 13:23:22 +0000 (06:23 -0700)]
Add API to query the current auto-rotation setting
bug:
13527779
Change-Id: I1ebcab1108bb03a997508033befeec26fb9a6b7e
Sascha Haeberling [Wed, 2 Apr 2014 04:45:51 +0000 (21:45 -0700)]
Make SettingsManager accessible on app-level, not Activity-level.
Bug:
13754773
This also cleans up the SettingsManager and removes all constructor
parameters except the context, which is needed.
Change-Id: I60a8d5582771e5a1f53a761897f4d41c30e50166
Sascha Haeberling [Wed, 2 Apr 2014 04:18:45 +0000 (04:18 +0000)]
Merge "Refactor UsageStatistic so it can be disabled more easily." into gb-ub-photos-denali
Erin Dahlgren [Tue, 1 Apr 2014 21:03:25 +0000 (14:03 -0700)]
Fix broken shutter button enabling in Photo and Video.
When I went in to implement globally disabling the shutter button during
a certain state transition of the app, I realized that
1. enabling the shutter button in Photo and Video was totally broken: the
methods being used for enabling the shutter button were totally empty!
2. setShutterEnabled in the AppController was totally empty.
3. we've done a horrible job with keeping names consistent: capture button
!= shutter button.
So I've fixed all of these things, which should solve existing bugs and make
my original task easier.
Change-Id: If1ae3b8c740ef678fbd20c2ffbb93576f48c8c19
Doris Liu [Wed, 2 Apr 2014 00:54:05 +0000 (00:54 +0000)]
Merge "Fix capture button layout for RTL" into gb-ub-photos-denali