OSDN Git Service
Sascha Haeberling [Tue, 22 Apr 2014 16:11:28 +0000 (09:11 -0700)]
Remove SmartCamera (Part 1/2)
Bug:
14254411
Change-Id: I09488e8c39fce104a92659a989a275a5f72821bb
Sascha Haeberling [Tue, 22 Apr 2014 21:33:49 +0000 (21:33 +0000)]
am
420595e8: (-s ours) Merge "DO NOT MERGE - Remove SmartCamera (Part 1/2)" into ub-camera-everglades
* commit '
420595e86147a691b9d06baf2e36a533b7e7c7fa':
DO NOT MERGE - Remove SmartCamera (Part 1/2)
Angus Kong [Tue, 22 Apr 2014 21:33:49 +0000 (21:33 +0000)]
am
7539e492: The coordinatations should be relative.
* commit '
7539e49296b993be37709f45385a6286618d464d':
The coordinatations should be relative.
Sascha Haeberling [Tue, 22 Apr 2014 21:33:03 +0000 (21:33 +0000)]
Merge "DO NOT MERGE - Remove SmartCamera (Part 1/2)" into ub-camera-everglades
Sascha Haeberling [Tue, 22 Apr 2014 16:11:28 +0000 (09:11 -0700)]
DO NOT MERGE - Remove SmartCamera (Part 1/2)
Bug:
14254411
Change-Id: I09488e8c39fce104a92659a989a275a5f72821bb
Angus Kong [Tue, 22 Apr 2014 16:54:07 +0000 (09:54 -0700)]
The coordinatations should be relative.
The coordinations we got in onLayout() is relative to its parent. FilmstripView
doesn't not consider this and the layout can be wrong when it's not fullscreen.
Change-Id: Icc3d40a9cb3c805f8b3a8a4652edbfd873296fa8
Baligh Uddin [Tue, 22 Apr 2014 14:56:58 +0000 (14:56 +0000)]
am
98842a62: (-s ours) am
beeccf8d: (-s ours) Import translations. DO NOT MERGE
* commit '
98842a6267052afc13e3e4f31cbb543ff95ee320':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Apr 2014 14:54:00 +0000 (14:54 +0000)]
am
beeccf8d: (-s ours) Import translations. DO NOT MERGE
* commit '
beeccf8d6193d0153a1a3f43944ebeff2c5649f7':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Apr 2014 14:53:49 +0000 (14:53 +0000)]
am
e4027c46: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
e4027c4673a0639ab2a241ccb2dbb3ccdf9909d4':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Apr 2014 14:51:20 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Mon, 21 Apr 2014 21:11:18 +0000 (14:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a0277c0931817b9c1104b63ee108f074988111b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 21 Apr 2014 21:09:58 +0000 (14:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I17b580bed7ccca78182ecff0eb47484d6ba5f0bc
Auto-generated-cl: translation import
Angus Kong [Mon, 21 Apr 2014 18:17:37 +0000 (11:17 -0700)]
Create cameradevice package for camera management.
Change-Id: I73c69a70736b0b0eb0ef069a7876cf75fee91262
Sascha Haeberling [Sat, 19 Apr 2014 06:30:34 +0000 (06:30 +0000)]
Merge "Catch potential RTE from Camera." into ub-camera-everglades
Sascha Haeberling [Fri, 18 Apr 2014 15:13:55 +0000 (08:13 -0700)]
Catch potential RTE from Camera.
I got this one on a Nexus S running CM. So maybe not a real problem in
the wild. But given the amount of errors we see in the wild about camera
not connection, we should revisit and see if any of these errors are
catchable, like this one.
Change-Id: I02421bb6a1b5256bf23c2b5fe81f11a78d02cd57
Sascha Haeberling [Fri, 18 Apr 2014 23:25:58 +0000 (23:25 +0000)]
am
e8766be4: Don\'t crash when less than two cameras are present.
* commit '
e8766be48ed4c0bd17d68a45152a34fa2c860b94':
Don't crash when less than two cameras are present.
Sascha Haeberling [Fri, 18 Apr 2014 01:47:51 +0000 (18:47 -0700)]
Don't crash when less than two cameras are present.
Bug:
14108948
Change-Id: Ib288f9fd2bd86f870df22c1fde03184f00cea219
Spike Sprague [Thu, 17 Apr 2014 18:45:19 +0000 (18:45 +0000)]
Merge "trigger remaining storage calculation during init move ic_video_disabled.png icons to res_p" into ub-camera-everglades
Spike Sprague [Thu, 17 Apr 2014 18:44:56 +0000 (18:44 +0000)]
Merge "make manual exposure compensation settings work acrss different devices bug:
13967706" into ub-camera-everglades
Sascha Haeberling [Thu, 17 Apr 2014 18:42:37 +0000 (18:42 +0000)]
Merge "Don't block the main thread on remote shutter code" into ub-camera-everglades
Spike Sprague [Sat, 12 Apr 2014 00:51:24 +0000 (17:51 -0700)]
make manual exposure compensation settings work acrss different devices
bug:
13967706
Change-Id: I2ebe579c8b7df1218546dd888b5bbfb5486e9e55
Sascha Haeberling [Thu, 17 Apr 2014 17:51:53 +0000 (10:51 -0700)]
Don't block the main thread on remote shutter code
Bug:
14135621
The current RemoreShutterBridge is doing a bunch of heavy listing,
so it shouldn't happen on the main thread.
Change-Id: Ic1a81e7dfd0a2fd5a7424058a6a27c712ed3ca51
Baligh Uddin [Thu, 17 Apr 2014 16:22:27 +0000 (16:22 +0000)]
am
d6421724: (-s ours) Import translations. DO NOT MERGE
* commit '
d64217247310efb38fc75133c896f2bd3cfe5ffb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 00:42:44 +0000 (17:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibef54163959c4247f3f6a6db39956b17f3420392
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Apr 2014 00:41:23 +0000 (17:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea2b9e573ea8ac74536e955f88b64178095e8205
Auto-generated-cl: translation import
Spike Sprague [Mon, 14 Apr 2014 23:16:27 +0000 (16:16 -0700)]
trigger remaining storage calculation during init
move ic_video_disabled.png icons to res_p
bug:
14062023
Change-Id: I93b506ce2c9f669067dc94259e63f44bc9378fea
Sascha Häberling [Wed, 16 Apr 2014 19:30:37 +0000 (19:30 +0000)]
am
ace5f7f8: Merge "Fix edge case in supported video quality selection." into gb-ub-photos-denali
* commit '
ace5f7f81899341d16bfea70c9bd4ec4b6ca2e56':
Fix edge case in supported video quality selection.
Sascha Häberling [Wed, 16 Apr 2014 18:51:59 +0000 (18:51 +0000)]
Merge "Fix edge case in supported video quality selection." into gb-ub-photos-denali
Seth Raphael [Wed, 16 Apr 2014 18:49:28 +0000 (18:49 +0000)]
am
1d891fe5: Do not crash when attempting to refocus a deleted image.
* commit '
1d891fe52f83d7be1d3a7f0b06b6fed327815c0a':
Do not crash when attempting to refocus a deleted image.
Paul Chang [Mon, 24 Mar 2014 16:05:45 +0000 (12:05 -0400)]
Fix edge case in supported video quality selection.
Bug:
14108743
If less than three distinct video quality levels are supported, it's possible
for getNextSupportedVideoQualityIndex() to return an out-of-range array index.
Instead, just return the previous supported video quality -- this appears to
be the intended behavior.
Change-Id: I089571edf6ff748ce4914f188b4ef844ecb638c2
Seth Raphael [Wed, 16 Apr 2014 18:24:07 +0000 (11:24 -0700)]
Do not crash when attempting to refocus a deleted
image.
Bug:
13546660
Change-Id: Ic260811ad2f45a44577609af0dc69a5c55c7fcfd
Seth Raphael [Wed, 16 Apr 2014 16:10:48 +0000 (16:10 +0000)]
am
92f19760: Don\'t update metadata on local data insert.
* commit '
92f197607eb6303e11f88dc65e7e23614e384615':
Don't update metadata on local data insert.
Seth Raphael [Tue, 8 Apr 2014 19:02:18 +0000 (12:02 -0700)]
Don't update metadata on local data insert.
It is possible for insert data to be called in
a loop with many items, and this will cause un-
needed lookups of meta data.
The metadata lookup is already handled but the
filmstrip lazily, so it is not necessary here.
Bug:
13875458
Change-Id: I476eb1d44fa3d089f47b8b16f9be6d3255b4759e
Doris Liu [Tue, 15 Apr 2014 19:04:09 +0000 (19:04 +0000)]
am
5dd85a13: Avoid using stale parameters to get focus mode in video
* commit '
5dd85a1399f795284c7f0e632d102b61bb82887a':
Avoid using stale parameters to get focus mode in video
Doris Liu [Tue, 15 Apr 2014 18:45:55 +0000 (11:45 -0700)]
Avoid using stale parameters to get focus mode in video
Bug:
13990664
Change-Id: If6a5b1cc9ce7d1ac67f0558a61036f228601b92b
Baligh Uddin [Mon, 14 Apr 2014 23:20:53 +0000 (23:20 +0000)]
am
fabcb7c7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
* commit '
fabcb7c74fd7f6c1494902b9504f223c5a16bb26':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Apr 2014 23:17:28 +0000 (23:17 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Mon, 14 Apr 2014 23:15:55 +0000 (23:15 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Andy Huibers [Mon, 14 Apr 2014 22:54:26 +0000 (22:54 +0000)]
am
2d6a8abe: Merge "Set video-size key for Samsung Brand devices." into gb-ub-photos-denali
* commit '
2d6a8abe5dd22492dc098a63a33d7d9ea5888999':
Set video-size key for Samsung Brand devices.
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
Sascha Haeberling [Mon, 14 Apr 2014 22:08:42 +0000 (22:08 +0000)]
am
0fed7e62: Safeguard callback receiver to prevent crashes.
* commit '
0fed7e62bfa0d8351b91d3531228a113637963a3':
Safeguard callback receiver to prevent crashes.
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
Baligh Uddin [Mon, 14 Apr 2014 20:05:35 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69d93a38d3052400b10ac110bf2e891a1c96181d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 14 Apr 2014 20:04:10 +0000 (13:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I569ed760c80fac566aed673dae4e91aae677e50f
Auto-generated-cl: translation import
Andy Huibers [Sat, 12 Apr 2014 03:47:04 +0000 (03:47 +0000)]
am
e08bc042: Check zoom enabled check and null check on zoom ratio list.
* commit '
e08bc0428d3d5695d029f0b412d98db6ff8ac956':
Check zoom enabled check and null check on zoom ratio list.
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 03:02:30 +0000 (03:02 +0000)]
am
c6ef756c: Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali
* commit '
c6ef756c0eb736c3e43cff13d593f5ad71d2cb7b':
Revert "ZoomRatios might not exist, not crash for logging."
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:20:58 +0000 (01:20 +0000)]
Merge "Remove an ICS workaround calling stopPreview." into ub-camera-everglades
Sascha Haeberling [Sat, 12 Apr 2014 01:15:56 +0000 (01:15 +0000)]
am
08acce5b: (-s ours) Merge "DO NOT MERGE Don\'t call stopPreview after taking a picture on the m8" into gb-ub-photos-denali
* commit '
08acce5b16beef4be30c5d0567d3452aa7e99c26':
DO NOT MERGE Don't call stopPreview after taking a picture on the m8
Sascha Haeberling [Sat, 12 Apr 2014 01:14:47 +0000 (18:14 -0700)]
Remove an ICS workaround calling stopPreview.
Bug:
13966525
Change-Id: I3592906a6220b6af228fa42ef77e5b0d6e19e7b8
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:29:28 +0000 (00:29 +0000)]
am
9ac314fb: Merge "ZoomRatios might not exist, not crash for logging." into gb-ub-photos-denali
* commit '
9ac314fb42435a090f33e9db051ab0f203484722':
ZoomRatios might not exist, not crash for logging.
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 22:18:56 +0000 (22:18 +0000)]
am
3c62221a: Update mode options with hardware spec whenever hdr setting changes.
* commit '
3c62221afd869828ba867fce15755a582f2c2334':
Update mode options with hardware spec whenever hdr setting changes.
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:30:55 +0000 (22:30 +0000)]
am
5209f79b: Shorten the preference string to fit
* commit '
5209f79bdaeefeb6e8f168917faa73c82d8d0290':
Shorten the preference string to fit
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:56:10 +0000 (15:56 +0000)]
am
21257b76: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
* commit '
21257b76d9018c7ea15cc41c9906bc3bd2950b9e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:54:16 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
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:51:22 +0000 (01:51 +0000)]
am
63da42d6: Merge "Tweak log levels for photo, video" into gb-ub-photos-denali
* commit '
63da42d610376d2fc02c0ac453d5df3a1e885504':
Tweak log levels for photo, video
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:43:14 +0000 (01:43 +0000)]
am
f66eb70a: Don\'t crash when listener registration gets out of sync
* commit '
f66eb70a66bb194f4bef54fe74a04d6c9a3515de':
Don't crash when listener registration gets out of sync
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:32:22 +0000 (22:32 +0000)]
am
f79de8d6: Merge "Fix the layout error in preview" into gb-ub-photos-denali
* commit '
f79de8d69c2305660e287ec872fe500b34739e44':
Fix the layout error in preview
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:13:00 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied0dc3c8c443805a0f2bd22cfc7039ce69d550da
Auto-generated-cl: translation import
Alan Newberger [Wed, 9 Apr 2014 20:12:44 +0000 (20:12 +0000)]
am
2d0fdb5e: Merge "Add logging override helper" into gb-ub-photos-denali
* commit '
2d0fdb5e6582126bd554030c7432745ae589f515':
Add logging override helper
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
Kevin Gabayan [Wed, 9 Apr 2014 19:26:30 +0000 (19:26 +0000)]
am
05ee74dc: Log memory consumption at end of onCreate (Camera2). Bug:
13280671
* commit '
05ee74dcf3b1c8e65229f43441d282fcf89744a6':
Log memory consumption at end of onCreate (Camera2). Bug:
13280671
Kevin Gabayan [Wed, 9 Apr 2014 19:26:29 +0000 (19:26 +0000)]
am
0aeb0c82: Query memory consumption at end of onCreate. Bug:
13280671
* commit '
0aeb0c82704401a050ad3b892ed1c9efa457013d':
Query memory consumption at end of onCreate. Bug:
13280671
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:08:45 +0000 (20:08 +0000)]
am
39262608: Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state" into gb-ub-photos-denali
* commit '
3926260864a25a7db00e5a7d629b363cc833ffb3':
Cancel touch event forwarding when transitioning from shimmy to scroll state
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:35:35 +0000 (19:35 +0000)]
am
f773a11d: Merge "Keep lights out even if the system changes it." into gb-ub-photos-denali
* commit '
f773a11d50fc48f3831f259075a0e64460f9baaa':
Keep lights out even if the system changes it.
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: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