OSDN Git Service
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
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.
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
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
Alan Newberger [Tue, 1 Apr 2014 18:56:00 +0000 (18:56 +0000)]
am
7bc10527: Move Camera2 launcher icons into res_p
* commit '
7bc10527e83321e5f01b56a8dca77877b9c4c5a6':
Move Camera2 launcher icons into res_p
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:07:14 +0000 (17:07 +0000)]
am
d210c295: Merge "Change flash animation duration and maximum alpha." into gb-ub-photos-denali
* commit '
d210c2958806c8e63d8caa152e27799e278becde':
Change flash animation duration and maximum alpha.
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:53:23 +0000 (04:53 +0000)]
am
265454d7: Enable all logging for dogfooding.
* commit '
265454d7861b3ec54656032de3d346b1711ab4c9':
Enable all logging for dogfooding.
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:20:01 +0000 (01:20 +0000)]
am
3aa83112: Merge "Re-add ongoing session when Activity is restarted." into gb-ub-photos-denali
* commit '
3aa83112286c2a0de39cb95f5010bc7882128578':
Re-add ongoing session when Activity is restarted.
Doris Liu [Tue, 1 Apr 2014 01:20:00 +0000 (01:20 +0000)]
am
84312832: Merge "New generic cling widget, add cling for refocus editor button" into gb-ub-photos-denali
* commit '
84312832d7dbae89df75046ce91bf3d675b4b928':
New generic cling widget, add cling for refocus editor button
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
Sascha Haeberling [Mon, 31 Mar 2014 23:58:11 +0000 (16:58 -0700)]
Re-add ongoing session when Activity is restarted.
Bug:
13637563
Change-Id: I0fd9a521479d8805f8c1d82b8f930a23d16b4217
Spike Sprague [Tue, 1 Apr 2014 01:09:53 +0000 (01:09 +0000)]
am
7c696626: Merge "keep three dots option toggle on the screen" into gb-ub-photos-denali
* commit '
7c696626e213f010ab3027165b7c70bc2345fe01':
keep three dots option toggle on the screen
Spike Sprague [Tue, 1 Apr 2014 01:06:06 +0000 (01:06 +0000)]
Merge "keep three dots option toggle on the screen" into gb-ub-photos-denali
Spike Sprague [Mon, 31 Mar 2014 20:58:01 +0000 (13:58 -0700)]
keep three dots option toggle on the screen
bug:
13716654
Change-Id: I142d2ce8c026ad4f4fded15475e4d2a42e10f859
Doris Liu [Mon, 31 Mar 2014 22:27:40 +0000 (15:27 -0700)]
New generic cling widget, add cling for refocus editor button
Bug:
13307036
Change-Id: If3a1759cbc0cbc66de1d3d15a3ae18999bf0bd1f
Doris Liu [Tue, 1 Apr 2014 00:24:31 +0000 (00:24 +0000)]
am
fb28f3bd: Fix mode switcher RTL layout
* commit '
fb28f3bd35ecb390cb09c3e5c90906e1b0e7044e':
Fix mode switcher RTL layout
Doris Liu [Mon, 31 Mar 2014 23:19:56 +0000 (16:19 -0700)]
Fix mode switcher RTL layout
Bug:
13732534
Change-Id: I30360263eb2aaf900be0e05101558fde41e6944c
Erin Dahlgren [Mon, 31 Mar 2014 21:27:39 +0000 (21:27 +0000)]
am
4e0a4641: Make last module used sticky after all camera launches.
* commit '
4e0a464166fca881fa93d51f43aeb334c874e4b1':
Make last module used sticky after all camera launches.
Erin Dahlgren [Mon, 31 Mar 2014 20:54:30 +0000 (13:54 -0700)]
Make last module used sticky after all camera launches.
Bug:
13716653
Change-Id: If72a2dc7a3dfe94f5ff73b6034b6bafc8073f40c
Sascha Haeberling [Mon, 31 Mar 2014 18:31:47 +0000 (18:31 +0000)]
am
33e3133b: Merge "Enable a memory override through Gservices." into gb-ub-photos-denali
* commit '
33e3133bb7161fad5f97880facdf8bea97d930d0':
Enable a memory override through Gservices.
Sascha Haeberling [Mon, 31 Mar 2014 18:24:59 +0000 (18:24 +0000)]
Merge "Enable a memory override through Gservices." into gb-ub-photos-denali
Angus Kong [Mon, 31 Mar 2014 18:05:28 +0000 (18:05 +0000)]
am
a5d07059: Add log for unfinished synchronous job.
* commit '
a5d07059d1f9d61d918a0b33e781efd764032eba':
Add log for unfinished synchronous job.
Angus Kong [Mon, 31 Mar 2014 16:19:27 +0000 (09:19 -0700)]
Add log for unfinished synchronous job.
bug:
13566485
Change-Id: Ic3920bcc5c2c8ffdfd7f55f6e688ddfea44cad93
Sascha Haeberling [Mon, 31 Mar 2014 15:07:39 +0000 (15:07 +0000)]
am
d1bb8e08: If debug is on, log everything.
* commit '
d1bb8e084f4ef1dc0b6836d8de07454a80de3ac9':
If debug is on, log everything.
Sascha Haeberling [Sat, 29 Mar 2014 00:23:34 +0000 (17:23 -0700)]
Enable a memory override through Gservices.
Bug:
13591498
Change-Id: I8515c57c2349279fb74071854b85021716895fa6
Sascha Haeberling [Sat, 29 Mar 2014 00:14:16 +0000 (17:14 -0700)]
If debug is on, log everything.
Change-Id: I706874c9ea1b03c2fd9f987cda9581f72883c914