OSDN Git Service
Lorenzo Colitti [Sat, 15 Jul 2017 19:38:00 +0000 (19:38 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev
TreeHugger Robot [Sat, 15 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev
Peng Xu [Fri, 14 Jul 2017 23:07:11 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am:
17e641dae5
Change-Id: I4391dafa9d153213e35ac58bceb8d2f4c958fde0
TreeHugger Robot [Fri, 14 Jul 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
TreeHugger Robot [Fri, 14 Jul 2017 21:33:51 +0000 (21:33 +0000)]
Merge "Take a wrench to the pipes" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 21:16:44 +0000 (21:16 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
Wei Wang [Fri, 14 Jul 2017 20:42:23 +0000 (20:42 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 20:24:37 +0000 (20:24 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev
Jeff Davidson [Fri, 14 Jul 2017 19:54:52 +0000 (19:54 +0000)]
Merge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:49:00 +0000 (19:49 +0000)]
Merge "Round mobile icon slash and fix color" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:33:26 +0000 (19:33 +0000)]
Merge "Preload app-process HALs in Zygote" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:26:43 +0000 (19:26 +0000)]
Merge "Fix crash in monodroid apps" into oc-dr1-dev
Wei Wang [Fri, 14 Jul 2017 18:39:30 +0000 (11:39 -0700)]
SystemServiceManager: Change from wall time to boottiime
elapsedRealtime is milliseconds since boot, including time spent in sleep
Bug:
63707383
Test: Build
Change-Id: I7db77565f2af6277f05400398044fad297872ea4
TreeHugger Robot [Fri, 14 Jul 2017 18:15:19 +0000 (18:15 +0000)]
Merge "Do not reload bitmap unless necessary" into oc-dr1-dev
Evan Laird [Fri, 14 Jul 2017 17:29:49 +0000 (13:29 -0400)]
Round mobile icon slash and fix color
Airplane mode slashed mobile signal icon should be rounded. Also it was
drawing in the foreground color instead of background. That was bad.
Test: visual
Change-Id: Ie7137929e1b54118482b0990e3d86ccb0f620e56
Fixes:
63533582
Jason Monk [Fri, 14 Jul 2017 14:22:36 +0000 (10:22 -0400)]
Fix crash in monodroid apps
Don't getApplicationContext if we already have an application.
Test: launch a monodroid app
Change-Id: I0c1558463053de3db0f1cd4693088e7c639ce5fa
Fixes:
63666480
Jeff Davidson [Fri, 14 Jul 2017 16:46:19 +0000 (09:46 -0700)]
Temporarily disable eUICC factory reset handling.
This seems to be causing users who elect not to wipe their eUICC on a
factory reset to end up on the eSIM slot after the reset instead of
the pSIM slot.
Bug:
63693573
Test: TreeHugger + factory reset local test
Change-Id: I414a16cde11e76ccc390e7a63a6803f5b402fe78
TreeHugger Robot [Fri, 14 Jul 2017 17:17:47 +0000 (17:17 +0000)]
Merge changes from topic 'camera-tron' into oc-dr1-dev
* changes:
CameraServiceProxy: Log camera usage metrics
CameraServiceProxy: Add CameraStatsLoggingService, event dumping
TreeHugger Robot [Fri, 14 Jul 2017 17:05:27 +0000 (17:05 +0000)]
Merge "AOD: Show date on always-on display" into oc-dr1-dev
Lucas Dupin [Thu, 6 Jul 2017 23:09:24 +0000 (16:09 -0700)]
Move palette constants to XML
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Change-Id: I22a5ef9b89c113f75261e8884fa1affb07b2265f
Fixes:
62373429
TreeHugger Robot [Fri, 14 Jul 2017 15:49:57 +0000 (15:49 +0000)]
Merge "AOD: Refactor low and high brightness modes" into oc-dr1-dev
Lorenzo Colitti [Mon, 10 Jul 2017 10:05:13 +0000 (19:05 +0900)]
Make failure to set addrgenmode a non-fatal error.
Bug:
17613910
Test: bullhead builds, boots, connects to wifi
Change-Id: I310dcacc6784c13904fca79b839b5f4d94bfc45e
Jason Monk [Fri, 14 Jul 2017 13:40:54 +0000 (09:40 -0400)]
Take a wrench to the pipes
- Track extensions in garbage tracking because they could be big
- Fix volume dialog cleanup to not leak
- Fix QSFragment cleanup to not leak
- Make DockedStackExistsListener static because it is going to leak
because /Binder/
- Add a secure setting to force on notifications for garbage monitoring
for those that really really want it.
Test: adb shell dumpsys activity service SystemUI | grep -A 12 LEAK
Change-Id: Id5689febd65eb8a22dbb4a0a15ec051fcdbbf8be
Fixes:
38461559
TreeHugger Robot [Fri, 14 Jul 2017 13:40:44 +0000 (13:40 +0000)]
Merge "Fix system crash" into oc-dr1-dev
Adrian Roos [Thu, 13 Jul 2017 17:55:38 +0000 (19:55 +0200)]
AOD: Refactor low and high brightness modes
Bug:
63427319
Test: Receive notification on AOD, observe that brightness does not change.
Change-Id: I6ab6d75121f51ac16c08e59a3e552808a8e70853
Adrian Roos [Wed, 12 Jul 2017 17:15:59 +0000 (19:15 +0200)]
AOD: Show date on always-on display
Test: Turn off display. Make sure date shows on AOD. Also make sure it works with a white wallpaper.
Fixes:
63528250
Change-Id: I82e0e579f351c5f145021d0b3759f79c11a1270e
TreeHugger Robot [Fri, 14 Jul 2017 05:41:34 +0000 (05:41 +0000)]
Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 02:54:59 +0000 (02:54 +0000)]
Merge "Convert CDMA caller ID codes while roaming on 3GPP networks" into oc-dr1-dev
Lorenzo Colitti [Fri, 14 Jul 2017 00:51:56 +0000 (00:51 +0000)]
Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev
* changes:
Add code to dump OffloadController state.
Fetch tethering offload stats.
Allow more than one source of tethering statistics.
TreeHugger Robot [Fri, 14 Jul 2017 00:36:22 +0000 (00:36 +0000)]
Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev
Siqi Lin [Thu, 13 Jul 2017 23:56:05 +0000 (23:56 +0000)]
Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 23:14:31 +0000 (23:14 +0000)]
Merge "Fix issue with double vibration trigger" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 23:01:11 +0000 (23:01 +0000)]
Merge "Add sensor HAL process into dump list" into oc-dr1-dev
Roozbeh Pournader [Thu, 13 Jul 2017 22:19:45 +0000 (15:19 -0700)]
Make TextInputTimePickerView use localized input
Previously, TextInputTimePickerView used the default numeric IME, which
could result in cases where the digits displayed in the text fields were
native, but the IME showed ASCII digits resulting in a mix.
Now we use setImeHintLocales to hint that we need a localized IME.
Change-Id: Ic4041dcc65a31bd00741c6d96d8cbc5dac9d77c8
Fixes:
63650251
Test: Manual (tested under en-US and ar-BH locales)
Lucas Dupin [Thu, 13 Jul 2017 22:19:27 +0000 (15:19 -0700)]
Do not reload bitmap unless necessary
Let's just wait until the current async task finishes,
the engine will be recreated if the bitmap changes.
Test: Set wallpaper, no black frame
Change-Id: Icad8c18095119e9e035efc04704bc6d2d35af6d9
Fixes:
63065764
Naveen Kalla [Wed, 12 Jul 2017 03:03:58 +0000 (20:03 -0700)]
Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.
Bug:
62933474
Test: Simulate Roaming scenario and ensure that the dial
string is converted as expected.
Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
Siqi Lin [Thu, 13 Jul 2017 21:04:13 +0000 (14:04 -0700)]
BootReceiver: Remove error log when last-header.txt is missing
It's normal for /data/system/last-header.txt to not exist on
the first boot after factory reset. The code already handles
this case properly so the Slog.e is just noise that shows up
in bugreports.
Bug:
37513804
Test: manual - boot after factory reset, check logcat
Change-Id: I1c8e3437cdbda5e04c0299764c7e4921bef67cb3
TreeHugger Robot [Thu, 13 Jul 2017 20:59:39 +0000 (20:59 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
David Lin [Thu, 13 Jul 2017 19:20:44 +0000 (12:20 -0700)]
Fix issue with double vibration trigger
This patch fixes an issue that cause duplicated calls to HAL even when
the first call succeeded.
Bug:
63667425
Test: manual test
Change-Id: I4c29e3c9872cc42ea143b3adda3a3defca728e71
Jorim Jaggi [Thu, 13 Jul 2017 20:13:33 +0000 (20:13 +0000)]
Merge "Also go to sleep when dozing" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 19:59:40 +0000 (19:59 +0000)]
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 19:49:28 +0000 (19:49 +0000)]
Merge "Tear down agent after preflight rejection" into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 19:41:32 +0000 (19:41 +0000)]
Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
* changes:
Check mark color after successful auth
Ripple colors should match sysui theme.
Correct navbar colors after rebooting
Eino-Ville Talvala [Thu, 13 Jul 2017 19:07:20 +0000 (12:07 -0700)]
CameraManager: Handle camera service being disabled explicitly
Previously, CameraManager handled a disabled camera service
implicitly, the same as it handles a temporarily-crashed camera
service.
However, the error reporting for the those cases isn't really the
same, so switch to being explicit - check for the disabled camera
service system property, and if it's set, short-circuit calls.
Test: Camera CTS continues to pass, Watch device with no camera
service also now passes camera CTS.
Bug:
62269118
Change-Id: I65a97f8c1b0f101999b2c04d4f1096b7f3aee858
TreeHugger Robot [Thu, 13 Jul 2017 19:03:48 +0000 (19:03 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
Qingxi Li [Thu, 13 Jul 2017 19:02:24 +0000 (19:02 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 18:53:12 +0000 (18:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 18:39:39 +0000 (18:39 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 18:28:09 +0000 (18:28 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev
Eino-Ville Talvala [Mon, 10 Jul 2017 23:23:50 +0000 (16:23 -0700)]
CameraServiceProxy: Log camera usage metrics
- Add new events for camera usage by camera facing
- Dump stored camera events into metrics logs
- Shuffle event ordering for privacy
- Limit history to 100 entries at most
Test: Verify event log collection includes camera events
Bug:
32449509
Change-Id: I2e80b84f9bba3691893dca653ac085fef0b6c98c
Eino-Ville Talvala [Mon, 10 Jul 2017 22:27:24 +0000 (15:27 -0700)]
CameraServiceProxy: Add CameraStatsLoggingService, event dumping
- Collect camera usage events (facing, client, duration)
- Create a JobService that triggers roughly daily to dump events
Test: Verify that 'adb shell cmd jobscheduler run android
13254266'
prints out all camera usage since last run
Bug:
32449509
Change-Id: I13172e6e68f5cdb94685a112c74d270d1dda45bf
Nikolas Bravo [Mon, 10 Jul 2017 11:06:34 +0000 (12:06 +0100)]
ProfileSelectDialog no longer removes caller activity from
task.
In Settings, after calling ProfileSelectDialog and choosing a profile,
then going back would go 2 activities back. The issue is that
ProfileSelectDialog was calling finish() in the no-longer-used
SettingsDrawerActivity. This caused the any activity calling the
dialog to be removed from the task, and thus being impossible to
go back to. This call to the drawer is also a code smell.
Bug:
36237246
Fixes:
36237246
Test: NA
Change-Id: I6f309b220ffae1d86e6879ddf6a0305ad3dde3e8
(cherry picked from commit
b975c0e44445f76d67e7576c1e8e08609b696408)
TreeHugger Robot [Thu, 13 Jul 2017 17:48:23 +0000 (17:48 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev
Doris Ling [Fri, 30 Jun 2017 23:04:56 +0000 (16:04 -0700)]
Update the max height/width attribute of the TwoTargetPreference icon.
Change the namespace for the icon image view to settings package.
Change-Id: Id1ffbc1742bedab93c9f03e9d464f532fe2c33af
Fix:
63666970
Test: Visual
(cherry picked from commit
a990b5da04b4f5d475ff038f99d7dd908e931d63)
TreeHugger Robot [Thu, 13 Jul 2017 17:40:44 +0000 (17:40 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 17:38:48 +0000 (17:38 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
Maurice Lam [Wed, 12 Jul 2017 23:43:49 +0000 (16:43 -0700)]
Load internal resources using name rather than ID
Since setup wizard is distributed by binary, and internal framework
resource IDs may shift due to OEM customizations, load the resource
via its name instead.
Long term SUW should move away from depeneding on framework internal
resources or be open sourced.
Test: Existing tests pass
Bug:
63546650
Change-Id: I3555945d1f310ee79bdfc3542411d46a4fd4bf7d
Lucas Dupin [Thu, 13 Jul 2017 17:03:47 +0000 (17:03 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
Selim Cinek [Thu, 13 Jul 2017 16:29:21 +0000 (16:29 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 16:01:10 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Paul McLean [Tue, 11 Jul 2017 17:18:59 +0000 (11:18 -0600)]
More fine-grained exception handling so we can still use non-excepting descriptors.
Bug:
63655391
Test: Manual - connect various devices and verify the connection state is correct.
Change-Id: Iae6143d2e853e916c8588e0c6f771c00714b3a8a
Julia Reynolds [Mon, 10 Jul 2017 14:51:01 +0000 (10:51 -0400)]
Fix system crash
Change-Id: I47d6d79682bfe907544f9282c26e350576618ce2
Fixes:
63474899
Test: runtest systemui-notification
TreeHugger Robot [Thu, 13 Jul 2017 15:31:41 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Selim Cinek [Thu, 13 Jul 2017 15:27:20 +0000 (17:27 +0200)]
Fixed a bug where status icons were not animating
Initializing should be done to true
Test: manual, add animating notification, observe statusbar
Change-Id: I53c7667184b1e9e0d065816982236b9a7b919b6f
Fixes:
63533925
Julia Reynolds [Thu, 13 Jul 2017 15:23:12 +0000 (11:23 -0400)]
Fix nomanservice notificationrecord leak
Test: runtest systemui-notification
Change-Id: Ic5761b917edd000bf73b3291b0ca95bbb0b9bedb
Fixes:
63585648
Evan Laird [Thu, 13 Jul 2017 15:09:39 +0000 (11:09 -0400)]
Fix mobile signal colors to match wifi et al
Test: visual;
Change-Id: Ic810d10d86ea5878e8a025b0d48c9ca7496ea819
Fixes:
63391344
Lorenzo Colitti [Wed, 12 Jul 2017 16:48:26 +0000 (01:48 +0900)]
Add code to dump OffloadController state.
Bug:
29337859
Bug:
32163131
Test: observed output of "adb shell dumpsys connectivity tethering"
Change-Id: Icc5aa605cd64a4a2bb5993941dcc4010cc0b1d8e
Lorenzo Colitti [Wed, 12 Jul 2017 06:48:07 +0000 (15:48 +0900)]
Fetch tethering offload stats.
Make tethering offload register an ITetheringStatsProvider and
fetch tethering stats from the hardware.
Currently we fetch stats in the following cases:
1. Just after changing upstreams, we fetch stats from the
previous upstream.
2. When we are polled by NetworkStatsService.
Bug:
29337859
Bug:
32163131
Test: builds, boots
Test: stats appear in tethering logs
Change-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56
Lorenzo Colitti [Mon, 10 Jul 2017 10:06:57 +0000 (19:06 +0900)]
Allow more than one source of tethering statistics.
Currently, netd is the only source of tethering statistics.
In order to support multiple sources, define a new
ITetheringStatsProvider interface that can be registered with
NetworkManagmentService. Convert the existing code into the
first ITetheringStatsProvider.
Bug:
29337859
Bug:
32163131
Test: builds, boots
Test: tethering stats continue to be collected
Change-Id: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
Selim Cinek [Thu, 13 Jul 2017 13:46:10 +0000 (15:46 +0200)]
Fixed a bug where an incoming call wasn't launching
When the lockscreen isn't showing, but aod is, an incomming
call would not launch its fullscreen intent but show up in
AOD1. In addition was the display completely messed up and
overlapping other parts of the AOD screen.
Test: receive call while in AOD but not locked
Change-Id: Icc3e989167e72289ddcd0a62064526db9004cdc2
Fixes:
62402251
Bill Yi [Thu, 13 Jul 2017 13:42:58 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d916ea4bce1d259de0703e12701b534f31178a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Adrian Roos [Thu, 13 Jul 2017 12:01:52 +0000 (12:01 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 10:10:00 +0000 (03:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id63562e9b590d6351469c5d884ebb9e5a24ba195
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Thu, 13 Jul 2017 07:50:26 +0000 (00:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife7e581a0b00d66c174680ed4e40ba8ba7fed86b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Thu, 13 Jul 2017 07:31:13 +0000 (07:31 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL
Additionally:
- move mOffloadController into MasterTetherSM
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- observed calls to the HAL setLocalPrefixes in tethering log
Bug:
29337859
Bug:
32163131
Change-Id: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
Andrii Kulian [Thu, 13 Jul 2017 03:34:52 +0000 (03:34 +0000)]
Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 02:15:49 +0000 (02:15 +0000)]
Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 02:12:29 +0000 (02:12 +0000)]
Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev
Bryce Lee [Thu, 6 Jul 2017 21:09:29 +0000 (14:09 -0700)]
Do not gate updating allDrawn on all child WindowStates.
A recent change prevents allDrawn in AppWindowToken from being
updated until all child WindowStates have been considered. However,
children that are not visible do not affect allDrawn and therefore
need to be excluded.
This changelist adds an additional check to make sure the child can
affect the allDrawn state before considering blocking on it. It also
adds additional logs to the WindowState dump to better understand
this scenario.
Change-Id: I76d0f75496ed3da6a16c4a1d7bf2e7dc5b8bbe1e
Bug:
63380251
Test: go/wm-smoke
Bryce Lee [Thu, 13 Jul 2017 01:44:17 +0000 (01:44 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 00:44:46 +0000 (00:44 +0000)]
Merge "CameraServiceProxy: Cleanups and receive more information from CameraService" into oc-dr1-dev
Phil Weaver [Wed, 12 Jul 2017 23:22:01 +0000 (23:22 +0000)]
Phil Weaver [Wed, 12 Jul 2017 23:15:37 +0000 (23:15 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5 am:
bb89a1e3fe am:
f645a57a5e am:
c3fc745a1c
am:
26e98edf31
Change-Id: I75d7844c2a000fab74cc82881f8ca4cc43f7acf3
Phil Weaver [Wed, 12 Jul 2017 23:10:07 +0000 (23:10 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5 am:
bb89a1e3fe am:
f645a57a5e
am:
c3fc745a1c
Change-Id: I534f11f2eb0f737a2640acf4482a4af27927f694
Phil Weaver [Wed, 12 Jul 2017 23:03:33 +0000 (23:03 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5 am:
bb89a1e3fe
am:
f645a57a5e
Change-Id: Ibff94cad13a97c9b4a696f5e6df0522e8ac89d50
Phil Weaver [Wed, 12 Jul 2017 22:57:43 +0000 (22:57 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5
am:
bb89a1e3fe
Change-Id: I9e53b0461cb3f28ddc023ba551c1cb4eb1007340
Phil Weaver [Wed, 12 Jul 2017 22:51:18 +0000 (22:51 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461
am:
998ef870c5
Change-Id: Icaf066033ce67780052b30be3de891907129404e
Lucas Dupin [Wed, 12 Jul 2017 22:44:42 +0000 (15:44 -0700)]
Check mark color after successful auth
Bouncer check mark color should never change
during auth, always respecting the theme.
Change-Id: Ie4fd89a32addbc106242aa239d01cb30f3cab5b3
Fixes:
62887909
Test: Visual
Phil Weaver [Wed, 12 Jul 2017 22:41:32 +0000 (22:41 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d
am:
cba64fb461
Change-Id: I9c4fc2279ffa79ee85dc8a46be21095918fa52ad
TreeHugger Robot [Wed, 12 Jul 2017 22:38:43 +0000 (22:38 +0000)]
Merge "Average of top 4 CNO" into oc-dr1-dev
Phil Weaver [Wed, 12 Jul 2017 22:35:35 +0000 (22:35 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35
am:
a6e0a6e31d
Change-Id: Ia5af67f07974b520d8c3e7424c07402793a486f2
Winson Chung [Wed, 12 Jul 2017 22:32:42 +0000 (22:32 +0000)]
Merge "Fixing some issues with the assistant stack" into oc-dr1-dev
Phil Weaver [Wed, 12 Jul 2017 22:30:08 +0000 (22:30 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987
am:
4d608d2f35
Change-Id: Id1626217e80920f162b735336ac708c4dd9467f9
Phil Weaver [Wed, 12 Jul 2017 22:24:06 +0000 (22:24 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323
am:
111a2c7987
Change-Id: Idb7d3c789c6241aa8d77eb6077930b47c7ba69e4
Phil Weaver [Wed, 12 Jul 2017 22:18:59 +0000 (22:18 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e
am:
ba46064323
Change-Id: I7119e3f003562f6d826d40ad3577b9db0e44c2c6
Phil Weaver [Wed, 12 Jul 2017 22:14:01 +0000 (22:14 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522
am:
1add6be25e
Change-Id: I83a6c654862443a69bfeeaf675a8c038b3f7fb53
Phil Weaver [Wed, 12 Jul 2017 22:06:27 +0000 (22:06 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84
am:
ba928bd522
Change-Id: I74a7b0488371606dd9bdccab854d23c0e09b1ac9
Winson Chung [Wed, 12 Jul 2017 22:04:43 +0000 (22:04 +0000)]
Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev
Phil Weaver [Wed, 12 Jul 2017 22:00:31 +0000 (22:00 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours
am:
f433884a84
Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297