OSDN Git Service
Andy Huibers [Mon, 14 Apr 2014 22:52:06 +0000 (22:52 +0000)]
Merge "Set video-size key for Samsung Brand devices." into gb-ub-photos-denali
Andy Huibers [Mon, 14 Apr 2014 20:53:12 +0000 (13:53 -0700)]
Set video-size key for Samsung Brand devices.
Bug:
14060121
Change-Id: I5b8e5b0259a4105b8839112b13e58f2222848c7e
Sascha Haeberling [Mon, 14 Apr 2014 21:41:57 +0000 (14:41 -0700)]
Safeguard callback receiver to prevent crashes.
Bug:
13765929
It is safe to add these checks here. The receiver is only set in
the constructor, and it's only created in one place, which is
onCreate. And the parameter is the Activity itself, so it can
never be null.
This means the NPE can only happen if onCameraOpened is called after
removeCallbackReceiver is called, which is in onDestroy of the activity.
In this case it's safe to exit.
Change-Id: Ibffd6d54679b564a11b3e83319896241f2e306ad
Andy Huibers [Sat, 12 Apr 2014 02:26:47 +0000 (19:26 -0700)]
Check zoom enabled check and null check on zoom ratio list.
Bug:
13987837
Change-Id: I45d3edc42a240c866f151c5e23431cd50eec7bc6
Sascha Häberling [Sat, 12 Apr 2014 02:59:56 +0000 (02:59 +0000)]
Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali
Sascha Häberling [Sat, 12 Apr 2014 02:58:12 +0000 (02:58 +0000)]
Revert "ZoomRatios might not exist, not crash for logging."
This reverts commit
de26138f7821e33cac293e9c78c23b5c4612dcd2.
Change-Id: Ia788ef858cf2bc8891a5bbbf1a538b49d583247d
Sascha Haeberling [Sat, 12 Apr 2014 01:13:52 +0000 (01:13 +0000)]
Merge "DO NOT MERGE Don't call stopPreview after taking a picture on the m8" into gb-ub-photos-denali
Sascha Haeberling [Sat, 12 Apr 2014 00:58:42 +0000 (17:58 -0700)]
DO NOT MERGE Don't call stopPreview after taking a picture on the m8
Bug:
13966525
The proper solution is to remove the stopPreview call completely,
but as we have only limited time for testing left, let's be
careful and target specific devices only.
Change-Id: I5aa90b7c72068bae5352a8396e39a2c82ac137b9
Sascha Haeberling [Sat, 12 Apr 2014 00:27:25 +0000 (00:27 +0000)]
Merge "ZoomRatios might not exist, not crash for logging." into gb-ub-photos-denali
Sascha Haeberling [Fri, 11 Apr 2014 23:59:38 +0000 (16:59 -0700)]
ZoomRatios might not exist, not crash for logging.
Bug:
13987837
Change-Id: I77b8863b60cf5311ffd326015e612dfaeb45daa2
Erin Dahlgren [Fri, 11 Apr 2014 21:44:04 +0000 (14:44 -0700)]
Update mode options with hardware spec whenever hdr setting changes.
Bug:
13965048
Change-Id: I7e718bb56cb5dc92c7583bef780d442c04644a56
Sascha Haeberling [Thu, 10 Apr 2014 22:23:44 +0000 (15:23 -0700)]
Shorten the preference string to fit
Bug:
13962104
Change-Id: Ie0ba57ad1644241748c8d0406c08be1c981b8f63
Baligh Uddin [Thu, 10 Apr 2014 15:54:16 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Alan Newberger [Thu, 10 Apr 2014 01:49:16 +0000 (01:49 +0000)]
Merge "Tweak log levels for photo, video" into gb-ub-photos-denali
Alan Newberger [Thu, 10 Apr 2014 01:25:34 +0000 (18:25 -0700)]
Tweak log levels for photo, video
Adjusting log levels to insure some simple state flow statements
are printed for all clients at info, plus a few other adjustments.
Bug:
13737123
Change-Id: Ic58b2ad44067253960d68678c34d82895f49f6a6
Sascha Haeberling [Thu, 10 Apr 2014 01:27:05 +0000 (18:27 -0700)]
Don't crash when listener registration gets out of sync
Bug:
13914960
In some cases it can happen that resume/pause sequences happen on
two CameraActivities at the same time, especially when switching
from lock-screen to non-lockscreen activities.
Change-Id: Ic0826fc4a1d601b0ba0e6ac9cef84c022d958ad4
Doris Liu [Wed, 9 Apr 2014 22:30:27 +0000 (22:30 +0000)]
Merge "Fix the layout error in preview" into gb-ub-photos-denali
Doris Liu [Wed, 9 Apr 2014 22:07:50 +0000 (15:07 -0700)]
Fix the layout error in preview
This bug is caused by view configuration and layout rect occasionally
out of sync and bottom bar's incapability of correcting itself. To
be specific, configuration can be out of sync with layout rect (i.e.
configuration.orientation is landscape but onLayout() passes in portrait
coordinates), but when that happens, configuration will soon correct
itself through onConfigurationChanged(), then another layout pass will
happen to make sure everything is laid out correctly. In this case,
when configuration and layout coordinates are inconsistent, bottom bar
lays out itself using the wrong alignment, and then changed the preview
rect accordingly. When another layout pass happens to correct this
inconsistency, bottom bar then lays out itself based on the correct
alignment and a wrong preview rect previously adjusted, rendering
correct alignment but wrong size.
Bug:
13911202
Change-Id: I7cf6dbea582ce3888df11039de8f94687fe75784
Baligh Uddin [Wed, 9 Apr 2014 20:11:39 +0000 (13:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: If12b5ebc603aca98d3945094f159b33b08ef0cf6
Auto-generated-cl: translation import
Alan Newberger [Wed, 9 Apr 2014 20:11:02 +0000 (20:11 +0000)]
Merge "Add logging override helper" into gb-ub-photos-denali
Alan Newberger [Wed, 9 Apr 2014 19:06:42 +0000 (12:06 -0700)]
Add logging override helper
This CL removes compile-time log suppression with a runtim override.
With a runtime override we can custom configure logging with a single
level, not quite as flexible as a boolean per level but should suit
our needs. Compile-time log pruning could be done with proguard if
desired.
Bug:
13737123
Change-Id: I8bdcaca44b4dc5c7eab8ef2f74e5181bcacd2727
Kevin Gabayan [Tue, 8 Apr 2014 23:25:23 +0000 (16:25 -0700)]
Log memory consumption at end of onCreate (Camera2).
Bug:
13280671
Change-Id: Ifdeadff2c89a08757cc2f3792ba61a2b54d19ae0
Kevin Gabayan [Tue, 8 Apr 2014 18:12:05 +0000 (11:12 -0700)]
Query memory consumption at end of onCreate.
Bug:
13280671
Change-Id: Iedc4c8907a6e726a1835494bd6fad93e6ee8a666
Doris Liu [Tue, 8 Apr 2014 20:04:42 +0000 (20:04 +0000)]
Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state" into gb-ub-photos-denali
Doris Liu [Tue, 8 Apr 2014 19:45:10 +0000 (12:45 -0700)]
Cancel touch event forwarding when transitioning from shimmy to scroll state
Bug:
13903149
Change-Id: I70badb1fdc959b3ce0a9d3385e664938ab7918a9
Sascha Haeberling [Tue, 8 Apr 2014 19:29:38 +0000 (19:29 +0000)]
Merge "Keep lights out even if the system changes it." into gb-ub-photos-denali
Sascha Haeberling [Tue, 8 Apr 2014 14:08:46 +0000 (07:08 -0700)]
Keep lights out even if the system changes it.
Bug:
13894148
Change-Id: Ie6d5b8fc1d3601082942a5c0843b447cb4805ceb
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:20:51 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
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: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: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: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: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: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:24:54 +0000 (19:24 +0000)]
Merge "Make removeOverlay publicly available." into gb-ub-photos-denali
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:40:45 +0000 (16:40 +0000)]
Merge "Workaround for black sqaure issue caused by incorrectly recreated HW layer" into gb-ub-photos-denali
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
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: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
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
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
Sascha Haeberling [Mon, 31 Mar 2014 20:22:17 +0000 (13:22 -0700)]
Refactor UsageStatistic so it can be disabled more easily.
Change-Id: I2ca6e7d5642b1400d4b13f2c45cb48793b2fc178
Doris Liu [Tue, 1 Apr 2014 23:55:13 +0000 (23:55 +0000)]
Merge "Temp swipe interception to support swipe from capture button" into gb-ub-photos-denali
Doris Liu [Tue, 1 Apr 2014 22:53:56 +0000 (15:53 -0700)]
Temp swipe interception to support swipe from capture button
Bug:
13535296
Change-Id: I911336ce407abbfe51759bb38ffff9a534a49de6
Spike Sprague [Tue, 1 Apr 2014 23:51:16 +0000 (23:51 +0000)]
Merge "properly resize capture flash anim overlay" into gb-ub-photos-denali
Doris Liu [Tue, 1 Apr 2014 20:58:30 +0000 (13:58 -0700)]
Fix capture button layout for RTL
Created a class to handle the custom layout of mode options
and bottom bar, simplied the dependency between the two in
terms of positioning.
Also did some restructuring in layout resources for better readability
Bug:
13734579
Change-Id: I7088057e0c84f02f3cc6d598935d64b68dbc9526
Erin Dahlgren [Tue, 1 Apr 2014 22:11:34 +0000 (15:11 -0700)]
Move disk IO from first time use background task.
Bug:
13251352
Change-Id: Ib6b0dbebb00f3210a649bb4d2782d65faaceb41c
Spike Sprague [Tue, 1 Apr 2014 20:25:38 +0000 (13:25 -0700)]
properly resize capture flash anim overlay
bug:
13651263
Change-Id: Icc9b23613185a0a5be606ec06c3e3ad4255be5c0
Erin Dahlgren [Tue, 1 Apr 2014 21:10:27 +0000 (21:10 +0000)]
Merge "Move CameraPerformanceTracker methods to beginning of triggers." into gb-ub-photos-denali
Erin Dahlgren [Tue, 1 Apr 2014 18:48:40 +0000 (11:48 -0700)]
Move CameraPerformanceTracker methods to beginning of triggers.
Bug:
11376004
Change-Id: I9aa5d632e4ca5462b4d2604a80346df6897fa413
Alan Newberger [Tue, 1 Apr 2014 18:16:40 +0000 (11:16 -0700)]
Move Camera2 launcher icons into res_p
Relocate icons into res_p as they are primarily for Camera2.
Bug:
13745522
Change-Id: If936a14350c4fa7443c7b6084dbb5386bd7d3fff
Angus Kong [Tue, 1 Apr 2014 17:02:43 +0000 (17:02 +0000)]
Merge "Change flash animation duration and maximum alpha." into gb-ub-photos-denali
Sascha Haeberling [Tue, 1 Apr 2014 04:40:44 +0000 (21:40 -0700)]
Enable all logging for dogfooding.
I will file a big to determine what logging level is right for launching.
For now let's enable all logs again we had it before, otherwise we might
miss some important logs.
Change-Id: I2abc7ca47c92987d594002bf09c82a69a6d6b056
Angus Kong [Tue, 1 Apr 2014 01:58:26 +0000 (18:58 -0700)]
Change flash animation duration and maximum alpha.
bug:
13340312
Change-Id: Ic239e345dfe2d8dd501565f2ea4614d0505ac478
Sascha Haeberling [Tue, 1 Apr 2014 01:17:11 +0000 (01:17 +0000)]
Merge "Re-add ongoing session when Activity is restarted." into gb-ub-photos-denali
Doris Liu [Tue, 1 Apr 2014 01:16:36 +0000 (01:16 +0000)]
Merge "New generic cling widget, add cling for refocus editor button" into gb-ub-photos-denali