OSDN Git Service
Adrian Roos [Wed, 26 Jul 2017 16:22:52 +0000 (16:22 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
am:
dd22dcbcdf
Change-Id: I50d98b16eb4ce43a555a0136a74421e891754786
Antony Sargent [Wed, 26 Jul 2017 16:18:33 +0000 (16:18 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
am:
1e74fdb684 -s ours
Change-Id: I489efc8ca8d93cd94ac71e2ea65f45e888a9a138
Adrian Roos [Wed, 26 Jul 2017 11:47:01 +0000 (11:47 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 10:53:34 +0000 (10:53 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 08:26:17 +0000 (08:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours
am:
4d00a9512a -s ours
Change-Id: I194fa29eb575b6bdd91a167c6d7826c4fda7df69
Bill Yi [Wed, 26 Jul 2017 08:18:10 +0000 (08:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours
am:
0ad45f6f76 -s ours
Change-Id: If23b7854224ec5320d2f912686deb3da10d34efb
Bill Yi [Wed, 26 Jul 2017 08:16:15 +0000 (08:16 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours
am:
090feca7b5 -s ours
Change-Id: I2b8ed5d538954b0d56aebea103ac863e985c15b6
Bill Yi [Wed, 26 Jul 2017 08:12:15 +0000 (08:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a7f60741ae -s ours
Change-Id: I30a22e1c267bc9e8bd287c48410cf9c475abdde0
Bill Yi [Wed, 26 Jul 2017 08:07:22 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b4e8cad186 -s ours
Change-Id: I8421a6ad828df9c491665144533931352a6196f1
Bill Yi [Wed, 26 Jul 2017 08:03:38 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE
am:
7c2b27f26f -s ours
Change-Id: I9711ab0a99f2309c7e61e3548d7a16f3e555d166
TreeHugger Robot [Wed, 26 Jul 2017 08:03:03 +0000 (08:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Jul 2017 07:53:12 +0000 (07:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Antony Sargent [Tue, 18 Jul 2017 22:28:46 +0000 (15:28 -0700)]
@Keep all the things in TestAccessPointBuilder
The test in packages/apps/Settings/tests/unit/src/com/android/settings/
wifi/WifiSettingsUiTest.java fails because the TestAccessPointBuilder
class and all methods in it seem to get stripped during build time
since they aren't referenced by code within the settings app itself.
Bug:
33245941
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I22b7e9fa54fcd67e0f754aca47907d87db9d7056
Merged-In: I92b56b7908e5be8a3553a2779646d48bb5b94f01
Roozbeh Pournader [Wed, 26 Jul 2017 05:53:34 +0000 (05:53 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev
am:
4fc156c451
Change-Id: I84c82030ef8b0ff9b7da990d5ec1ffcda1984a30
Chet Haase [Wed, 26 Jul 2017 05:47:47 +0000 (05:47 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev
am:
1c31f9653f
Change-Id: Ib76daf28d94791f0c525aa1dcc57939ac60050c9
Roozbeh Pournader [Wed, 26 Jul 2017 05:44:41 +0000 (05:44 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev
Chet Haase [Wed, 26 Jul 2017 05:40:41 +0000 (05:40 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev
Chet Haase [Fri, 21 Jul 2017 17:45:31 +0000 (10:45 -0700)]
Update overscroll and toast UI
Overscroll updates:
Same shape, but smaller radius (doesn't come as far into the view)
and more translucent (max 15% instead of 50%). Overall, more subtle.
Toast updates:
Light background, smaller, dark font, closer to the bottom of the
container.
Test: manual unit tests. Also:
cts test ToastTest for toast changes
cts test EdgeEffectTests for EdgeEffect changes (adding some tests to
known-failures for now, due to brittle golden-image failures - see
CL ag/
2596621)
Bug:
30563264 Refresh toast visuals for Android ODR
Bug:
63010438 Tweaks to overscroll animation
Change-Id: I0fac6322b0b81d030c8d174852c134211290bbea
Bill Yi [Wed, 26 Jul 2017 04:24:47 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie81e9b6438034399af10f964876f14cb08b8ceb7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:17:50 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd1d218d134f9871650b17254741c4a0b40a4f0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:15:58 +0000 (21:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f6bf766d9d5d91f8b885e4ecc0878cacde1668f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Winson Chung [Wed, 26 Jul 2017 04:09:03 +0000 (04:09 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
am:
e31847642c
Change-Id: I0f0737b4407b9af27bf2012643786c718832d273
Winson Chung [Wed, 26 Jul 2017 04:01:48 +0000 (04:01 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 03:42:09 +0000 (03:42 +0000)]
Merge "Only display RSSI/band information if network is connected." into oc-mr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 03:41:27 +0000 (03:41 +0000)]
Merge "Sort APs by Speed label value instead of ranking score." into oc-mr1-dev
Christine Franks [Wed, 26 Jul 2017 03:26:23 +0000 (03:26 +0000)]
Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev
Christine Franks [Wed, 26 Jul 2017 02:54:42 +0000 (02:54 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
am:
bdaada0af9
Change-Id: I1b15ab6395b4935d1169246d42fa0a6f0c588a3d
Philip Quinn [Wed, 26 Jul 2017 02:44:48 +0000 (02:44 +0000)]
Don't block the input thread to notify the StatusBar about key events.
am:
4b5b3c6ccc
Change-Id: Idcf28d3145c8e02a94dd128e445a89cf9ae67c88
Christine Franks [Wed, 26 Jul 2017 02:39:09 +0000 (02:39 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
Philip Quinn [Fri, 21 Jul 2017 04:07:58 +0000 (21:07 -0700)]
Don't block the input thread to notify the StatusBar about key events.
Also, give it a ping for volume key events.
Bug:
63183852
Bug:
63909062
Test: runtest systemui
Change-Id: I3e8507ad8fc23cf3078313b500b5012afc84fa07
Lucas Dupin [Wed, 26 Jul 2017 02:29:51 +0000 (02:29 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev
am:
59aadea809
Change-Id: I191fea7efeae05fab885dcb91fc67ea5e54ec147
Kevin Chyn [Wed, 26 Jul 2017 02:27:56 +0000 (02:27 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev
am:
192e7ccf45
Change-Id: Ib77387825e02f7579783e0a9e23f5e9d4b7ed537
TreeHugger Robot [Wed, 26 Jul 2017 02:18:10 +0000 (02:18 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 02:16:55 +0000 (02:16 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 01:09:33 +0000 (01:09 +0000)]
Merge "compressed images on system partition" into oc-mr1-dev
Christine Franks [Thu, 20 Jul 2017 21:01:55 +0000 (14:01 -0700)]
Remove RetailDemoModeServiceInternal
Bug:
62712426
Test: make -j100
Change-Id: I0b852aef30a8cadcda08fcff1dcf861aac2a4d7e
Christine Franks [Wed, 26 Jul 2017 00:26:16 +0000 (00:26 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
am:
4ac942f140 -s ours
Change-Id: Id0fe8d3025e47c9e798ee082d7c22dd18c308254
Christine Franks [Wed, 26 Jul 2017 00:07:14 +0000 (00:07 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
Lucas Dupin [Tue, 25 Jul 2017 00:44:25 +0000 (17:44 -0700)]
Themable volume and power dialogs
Test: visual
Bug:
63903361
Change-Id: I3e4dc74e960f212985712120341d3a80543c96db
Roozbeh Pournader [Tue, 25 Jul 2017 23:29:22 +0000 (16:29 -0700)]
Remove Kwasio (nmg) from user-selectable languages
The language had inadequate locale data, and even the name
of the Kwasio language itself was not localized to Kwasio.
Change-Id: I7b92460b7b3d736593db4a2f94d47863264561b4
Fixes:
64037672
Test: Manual (Kwasio, as 'Nmg', is no longer listed in Settings)
Jason Monk [Tue, 25 Jul 2017 23:27:38 +0000 (23:27 +0000)]
Merge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev
am:
18cb24ba33
Change-Id: Ibdb8fa6a4e9ce57009342c12cf169df959974dd2
Selim Cinek [Tue, 25 Jul 2017 23:10:20 +0000 (23:10 +0000)]
Merge "Changing the way the media image scales" into oc-dr1-dev
am:
e06e3f97fc
Change-Id: I60cd55a9d8ef2de15aa1f268f42923955c9d050c
Sundeep Ghuman [Tue, 25 Jul 2017 23:05:11 +0000 (23:05 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev
am:
d68b6dc56b
Change-Id: If442689c6a05ad261a846a5252d9a0256520508e
Jason Monk [Tue, 25 Jul 2017 23:02:11 +0000 (23:02 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev
am:
bad473d147
Change-Id: I211be901cd264c3ff4f505abf54dd1d9d8c7667d
Makoto Onuki [Tue, 25 Jul 2017 22:58:23 +0000 (22:58 +0000)]
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
am:
906d8f57bf
Change-Id: Ied5b515396764d398807c4f945aaf55af87de03a
TreeHugger Robot [Tue, 25 Jul 2017 22:55:08 +0000 (22:55 +0000)]
Merge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev
Selim Cinek [Tue, 25 Jul 2017 22:45:55 +0000 (22:45 +0000)]
Merge "Changing the way the media image scales" into oc-dr1-dev
Bill Yi [Tue, 25 Jul 2017 22:44:17 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
edfb7279ee -s ours
Change-Id: I1464cf2e842dc2c9751a6e801a714cd9234fc563
Bill Yi [Tue, 25 Jul 2017 22:42:01 +0000 (22:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
f969869726 -s ours
Change-Id: I11b516cc23ae3714a6c75d937bdb6a24a772c255
TreeHugger Robot [Tue, 25 Jul 2017 22:41:39 +0000 (22:41 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev
Winson Chung [Tue, 25 Jul 2017 22:39:12 +0000 (22:39 +0000)]
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev
am:
cb9f6de368
Change-Id: I37a8cf4df2a430ea1ecd2231d48bbfaa45a45d3d
Alison Cichowlas [Tue, 25 Jul 2017 22:36:50 +0000 (22:36 +0000)]
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev
am:
5110b31dda
Change-Id: I9a09aae1a3fe9957f8568af85c4f5ed1773b50f8
TreeHugger Robot [Tue, 25 Jul 2017 22:35:18 +0000 (22:35 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 22:34:15 +0000 (22:34 +0000)]
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev
am:
b63b011419
Change-Id: If69caeaacd480686f5737e2f96d6804ef13ce380
Lucas Dupin [Tue, 25 Jul 2017 22:29:41 +0000 (22:29 +0000)]
Merge "Ambient indicator text color" into oc-dr1-dev
am:
5c6c7586cd -s ours
Change-Id: I7e26ad486d3478c405d2547fb43accf01a7328e5
TreeHugger Robot [Tue, 25 Jul 2017 22:21:29 +0000 (22:21 +0000)]
Merge "resolve merge conflicts of
a1f64b0a9188 to oc-mr1-dev" into oc-mr1-dev
Winson Chung [Tue, 25 Jul 2017 21:28:03 +0000 (14:28 -0700)]
Ensure that we timeout waiting when starting the PiP menu activity
- In some cases we don't get notified when the menu activity start is
interrupted. In such a case, we should timeout and allow for the next
menu activity start to complete, and log the issue.
Bug:
63752800
Test: Artificially induce missed callback, ensure that we can still
launch the PiP activity afterwards.
Change-Id: Id92890a53ce47c4e9f593a5434fd8f9137468799
Christine Franks [Thu, 20 Jul 2017 21:01:55 +0000 (14:01 -0700)]
DO NOT MERGE - Remove RetailDemoModeServiceInternal
Bug:
62712426
Test: make -j100
Change-Id: I0b852aef30a8cadcda08fcff1dcf861aac2a4d7e
TreeHugger Robot [Tue, 25 Jul 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 20:45:00 +0000 (20:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Amit Pawar [Tue, 25 Jul 2017 20:18:52 +0000 (20:18 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-mr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 20:11:16 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 20:10:38 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jason Monk [Tue, 25 Jul 2017 19:46:33 +0000 (15:46 -0400)]
Fix RTL for Nav icons
Test: manual
Change-Id: I972641fc8d122ce9f6d4204398559b11a36a4a40
Fixes:
63644656
TreeHugger Robot [Tue, 25 Jul 2017 19:35:43 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 19:35:03 +0000 (19:35 +0000)]
Merge "Support font resource in TextAppearanceSpan" into oc-mr1-dev
Winson Chung [Tue, 25 Jul 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 19:03:35 +0000 (19:03 +0000)]
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev
Lucas Dupin [Tue, 25 Jul 2017 19:00:01 +0000 (12:00 -0700)]
resolve merge conflicts of
a1f64b0a9188 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic2395d055e1f27b186c3b87be5440dc410ee16a3
Jason Monk [Tue, 25 Jul 2017 18:44:28 +0000 (14:44 -0400)]
Add confirmation dialog when turning off cell data from QS
Test: manual
Change-Id: I1956750700c8fa2bf0e715b5ec92cf10fa3e9486
Fixes:
36436115
TreeHugger Robot [Tue, 25 Jul 2017 18:19:24 +0000 (18:19 +0000)]
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 18:09:42 +0000 (18:09 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds" into oc-mr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 18:01:50 +0000 (18:01 +0000)]
Merge "dynamically install all missing splits" into oc-mr1-dev
Lucas Dupin [Tue, 25 Jul 2017 17:53:56 +0000 (17:53 +0000)]
Merge "Ambient indicator text color" into oc-dr1-dev
Todd Kennedy [Tue, 27 Jun 2017 21:13:55 +0000 (14:13 -0700)]
compressed images on system partition
Change-Id: I43c8c331883b5b381fb0f133fff448f3a57d0fe5
Bug:
36446542
Test: Manual
Test: Create a stub and a compressed application; put on the /system partition
Test: Restart the system and see that it decompresses the full application onto the /data partition
Test: Restart again and see that we skip decompression
Test: Create an invalid compressed application [eg. empty file]
Test: Restart the system and see that the stub is disabled
Test: Restart again and see that we skip decompression
Adrian Roos [Tue, 25 Jul 2017 17:43:14 +0000 (17:43 +0000)]
Merge "AOD: Show keyguard indications in white" into oc-dr1-dev
am:
ec05633f5f
Change-Id: If3c93807c34241dd5d97502eaf225f14c3527e45
Julia Reynolds [Tue, 25 Jul 2017 17:40:47 +0000 (17:40 +0000)]
Merge "Zen introduction text updates" into oc-dr1-dev
am:
60bf540e20
Change-Id: I3d094ed410060fd2ccb223a16020493f8893d88f
TreeHugger Robot [Tue, 25 Jul 2017 17:40:02 +0000 (17:40 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 17:33:29 +0000 (17:33 +0000)]
Merge "AOD: Show keyguard indications in white" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 17:31:18 +0000 (17:31 +0000)]
Merge "Zen introduction text updates" into oc-dr1-dev
Tomasz Wasilczyk [Tue, 25 Jul 2017 17:18:50 +0000 (17:18 +0000)]
Merge "Rename ACCESS_FM_RADIO to ACCESS_BROADCAST_RADIO permission." into oc-mr1-dev
Alison Cichowlas [Tue, 25 Jul 2017 14:56:16 +0000 (10:56 -0400)]
Make back button dismiss power dialog,
by making dialog focusable.
Test: Manual - verified back button behavior, verified outside touches still ok.
Fixes:
63855564
Change-Id: I684bd4b3f77d00d81fe56c5005ab86403670a851
Adrian Roos [Tue, 25 Jul 2017 17:09:16 +0000 (17:09 +0000)]
Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev
am:
9ffa87552b
Change-Id: I921b33e74287d7d629ff07f5afbd1909d5a785b1
TreeHugger Robot [Tue, 25 Jul 2017 17:00:22 +0000 (17:00 +0000)]
Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev
Calin Juravle [Tue, 25 Jul 2017 16:54:06 +0000 (16:54 +0000)]
Merge "Fix system server compilation in ZygoteInit" into oc-mr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 16:13:08 +0000 (16:13 +0000)]
Merge "Add API for virtual preloads" into oc-mr1-dev
Winson Chung [Tue, 25 Jul 2017 15:56:22 +0000 (15:56 +0000)]
Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev
am:
f1f25ad5f2
Change-Id: I3289be6435be80db8fa76a0e14b0bdef0ce317ee
Pankaj Kanwar [Tue, 25 Jul 2017 15:54:44 +0000 (15:54 +0000)]
Merge "Default-disable tethering offload" into oc-dr1-dev
am:
1244ff1956
Change-Id: I289fb5e7cc41d617065c3358cc4810d1825c3ff0
Winson Chung [Tue, 25 Jul 2017 15:45:39 +0000 (15:45 +0000)]
Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev
Pankaj Kanwar [Tue, 25 Jul 2017 15:43:52 +0000 (15:43 +0000)]
Merge "Default-disable tethering offload" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 15:33:37 +0000 (15:33 +0000)]
Merge "Ambient indicator text color" into oc-mr1-dev
Julia Reynolds [Fri, 21 Jul 2017 15:15:52 +0000 (11:15 -0400)]
Zen introduction text updates
- Update color of text/button for legibility
- prevent poorly timed zen update broadcasts from interrupting the
zen footer window animation
Change-Id: I04eaaae80fb0647b0a792023f5ed03ebd9142e04
Fixes:
63916428
Fixes:
63815440
Test: manual
Adrian Roos [Tue, 25 Jul 2017 14:46:23 +0000 (16:46 +0200)]
AOD: Show keyguard indications in white
Fixes an issue where colored keyguard indications were hard
to read on AOD.
Change-Id: I6bbb6267278a7397327f1fc4d88304d83f5f1ff1
Fixes:
63686192
Test: Set up fingerprint; go to AOD; tap wrong finger; verify message is shown in white
Bill Yi [Tue, 25 Jul 2017 14:18:00 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cbbc0e35bc9e917d877df5561d8e93ac43c3db3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Adrian Roos [Tue, 25 Jul 2017 14:11:10 +0000 (14:11 +0000)]
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev
am:
544e628e16
Change-Id: I2df5b364bbfde27299d5f5114224dd6bfaeaa782
Alex Sakhartchouk [Tue, 25 Jul 2017 14:09:10 +0000 (14:09 +0000)]
Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev
am:
9b53851d58
Change-Id: I73f621eae44bc8cac298d9772b41c5d93eaa185e
Adrian Roos [Tue, 25 Jul 2017 14:01:07 +0000 (14:01 +0000)]
Merge "AOD: Skip prox check if cached prox value available" into oc-dr1-dev
am:
f96573f894
Change-Id: Ia89613aac856b104b32394d6040aa4694327cf55
TreeHugger Robot [Tue, 25 Jul 2017 13:55:35 +0000 (13:55 +0000)]
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 13:54:25 +0000 (13:54 +0000)]
Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 13:52:51 +0000 (13:52 +0000)]
Merge "AOD: Skip prox check if cached prox value available" into oc-dr1-dev
OSDN Git Service
