Bonian Chen
ea44a49cfd
[Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4
am: 9c4d1190d9
...
Change-Id: Icf336c69791952c542c4c31d02a1da901e4db70e
2020-03-30 18:28:46 +00:00
tim peng
49480d1f53
Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92
am: 3e73d0f92c
...
Change-Id: Ib8b6ff0cd9dfc4ae2fdfd535354fcdd3fac5e261
2020-03-30 18:27:22 +00:00
Artur Satayev
2c0f44e29e
[automerger skipped] Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91
am: f4ddb539ea
-s ours
...
am skip reason: Change-Id Icab88938f1a49a892e0d62b2a833b659d6725267 with SHA-1 772243ca06
is in history
Change-Id: I42f1b6e65bf680c558e2e275504bd091dbd050c9
2020-03-30 18:27:04 +00:00
Bonian Chen
9c4d1190d9
[Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4
...
Change-Id: Ia5b8007cd0dc6b201493a1b88f277a1c10500bbb
2020-03-30 04:25:20 +00:00
Bonian Chen
c134ef08d4
[Settings] Replace ImsManager#isWfcEnabledByPlatform()
...
Replace ImsManager#isWfcEnabledByPlatform().
Bug: 140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Change-Id: I85907efb39aecdb3fb18cacf11ce4510b898edc4
2020-03-30 03:34:01 +00:00
tim peng
3e73d0f92c
Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92
...
Change-Id: Ic593ca5ddc1774b7b6895fee106dba8c595ff8a0
2020-03-30 03:14:35 +00:00
tim peng
ddd8a8fa92
Merge "Add zero state in output switcher" into rvc-dev
2020-03-30 02:54:33 +00:00
Artur Satayev
f4ddb539ea
Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91
...
Change-Id: Ia152eba38febb9ae5f7321de77a1b5d198d9cf74
2020-03-29 18:22:34 +00:00
Artur Satayev
a14ed2a8ac
Do not exlicitly declare dependency on changeid processor. am: 772243ca06
...
Change-Id: I367517c904a8bcb97df844af9c8f06c9870e198f
2020-03-29 18:22:20 +00:00
Artur Satayev
836dcbaf91
Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev
2020-03-29 18:07:37 +00:00
Artur Satayev
f9cc52d670
Do not exlicitly declare dependency on changeid processor.
...
Annotation processor is exported via app-compat-annotations library.
Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Icab88938f1a49a892e0d62b2a833b659d6725267
Merged-In: Icab88938f1a49a892e0d62b2a833b659d6725267
Exempt-From-Owner-Approval: clean up
(cherry picked from commit b4924c2828
)
2020-03-28 16:34:10 +00:00
Artur Satayev
772243ca06
Do not exlicitly declare dependency on changeid processor.
...
Annotation processor is exported via app-compat-annotations library.
Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Icab88938f1a49a892e0d62b2a833b659d6725267
Merged-In: Icab88938f1a49a892e0d62b2a833b659d6725267
Exempt-From-Owner-Approval: clean up
(cherry picked from commit b4924c2828
)
2020-03-28 16:30:47 +00:00
Kevin Chyn
38c724f4f8
Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f
am: 36359c9e96
...
Change-Id: Iadea914ac19e929d4020142736bb0dc959d824f0
2020-03-28 00:19:26 +00:00
Kevin Chyn
36359c9e96
Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f
...
Change-Id: Ib1da534f9cdd0e1f9a1739b9be9d7669f1ec3ca6
2020-03-28 00:12:30 +00:00
Kevin Chyn
ef02804952
Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f
am: 87723f3db7
...
Change-Id: I4d0fd4de66f85adc86829b4b63dbaa19e5c52e02
2020-03-28 00:07:04 +00:00
Kevin Chyn
87723f3db7
Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f
...
Change-Id: Ic3aeaa4cfdee235a0cd5448d8cb2b31fe47f14cc
2020-03-28 00:06:44 +00:00
Kevin Chyn
ef28e9b75f
Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev
2020-03-28 00:06:00 +00:00
Curtis Belmonte
1e510e6ac1
Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27
am: 6654372fde
...
Change-Id: I5acfdaf6398efb09a0813c8b30ad98bb62badaa2
2020-03-27 23:02:04 +00:00
Curtis Belmonte
c68465f024
Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27
am: 33851b108f
...
Change-Id: I789fafe027e1b105abc7dd59d65bbbad1a979010
2020-03-27 22:55:51 +00:00
Curtis Belmonte
6654372fde
Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27
...
Change-Id: Ifa42922dfc21fadf3ff3dbdc32e6f4314f5846cb
2020-03-27 22:48:07 +00:00
Curtis Belmonte
33851b108f
Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27
...
Change-Id: Ia6c51e1c80bdf988c3a24f4268ef2130ee549f5b
2020-03-27 22:47:17 +00:00
Curtis Belmonte
da4f9f7c27
Merge "Set CDC detail string as subtitle, not description" into rvc-dev
2020-03-27 22:42:22 +00:00
Kevin Chyn
28a034d6ed
Adjust ConfirmDeviceCredentialActivity system bars
...
CDCA is a transparent activity with the sole purpose of
requesting authentication. Since authentication is all drawn
by SystemUI, we should also stop this activity from drawing
the StatusBar.
Register to receive biometric system events (early user canceled),
so that we can finish() and start the activity transition
simultaneously. This fixes some navigation bar jank.
Bug: 148273355
Test: Set up a work profile, then install BiometricPromptDemo
Disable one-lock and set up a password/biometric for the
work profile. Lock/unlock screen, then open the work
profile version of the app. No status bar jank seen.
Change-Id: I54a352527ed007dcaf1bea14a51711e4022fe028
2020-03-27 12:12:30 -07:00
Julia Reynolds
cfedf81a20
Merge "Fix broken test" into rvc-dev am: 5a950b763f
am: e8884576f7
...
Change-Id: I656891f22b7c9b38221263840bc23d3faf618209
2020-03-27 16:27:07 +00:00
Julia Reynolds
ade39e479f
Merge "Fix broken test" into rvc-dev am: 5a950b763f
am: 275f372a72
...
Change-Id: I083f196ec1f67e45fcbb6b9b2b6032a51dd0d8d9
2020-03-27 16:17:07 +00:00
Julia Reynolds
e8884576f7
Merge "Fix broken test" into rvc-dev am: 5a950b763f
...
Change-Id: I5fbbdc605987dc3b6080b26c94ced86340ee18c5
2020-03-27 16:12:27 +00:00
Julia Reynolds
275f372a72
Merge "Fix broken test" into rvc-dev am: 5a950b763f
...
Change-Id: If25879aec1e877bb64b1f3e2c831c677f3b80dc9
2020-03-27 15:59:02 +00:00
Julia Reynolds
5a950b763f
Merge "Fix broken test" into rvc-dev
2020-03-27 15:40:47 +00:00
Automerger Merge Worker
f4950d5c35
Merge "Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56
am: 8fd2e35c3f" into rvc-d1-dev-plus-aosp
2020-03-27 15:17:02 +00:00
TreeHugger Robot
a4a23c4bb8
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56
am: 98d770345d
...
Change-Id: Ib9b375e98d6afe20f8d61b37b7c426a5a4708a9f
2020-03-27 15:16:54 +00:00
TreeHugger Robot
4d9c465580
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56
am: 8fd2e35c3f
...
Change-Id: I97c3f28aba507ea3de52fc630a3278ebc806b1aa
2020-03-27 15:16:36 +00:00
TreeHugger Robot
8fd2e35c3f
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56
...
Change-Id: Ic3e5681d07b89a7cbb15ea68140ee5dd53097e25
2020-03-27 15:05:34 +00:00
TreeHugger Robot
98d770345d
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56
...
Change-Id: I3e02884ec575cd33d4541a41a99403d79e79735b
2020-03-27 15:03:51 +00:00
TreeHugger Robot
50aeb48c56
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev
2020-03-27 14:43:57 +00:00
Automerger Merge Worker
c35adb05e9
Merge "Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406
am: ca9dad3430" into rvc-d1-dev-plus-aosp
2020-03-27 14:27:50 +00:00
TreeHugger Robot
f993a22f48
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406
am: ca9dad3430
...
Change-Id: I9c9fbe87b500e9e74c81c75592672353a8a87c0c
2020-03-27 14:27:47 +00:00
TreeHugger Robot
0e6dbd0440
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406
am: b22f48ea5d
...
Change-Id: I251d19f45e4ea543c9c473e18de60820f827631b
2020-03-27 14:27:38 +00:00
TreeHugger Robot
ca9dad3430
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406
...
Change-Id: I6259f15e62ecb2bd18e9430ae79ce7f6f455945d
2020-03-27 14:11:07 +00:00
TreeHugger Robot
b22f48ea5d
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406
...
Change-Id: Ic73beaab9e63e46a642fa089cfa60b1fece0b454
2020-03-27 14:10:48 +00:00
TreeHugger Robot
5f886e7406
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev
2020-03-27 13:53:22 +00:00
Julia Reynolds
83d0de8d07
Fix broken test
...
Test: this
Fixes: 152374833
Change-Id: I9065f6b3700fa288cb3fd65ef2b24c2821325e51
2020-03-27 09:36:18 -04:00
TreeHugger Robot
c37d7e42cb
Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f
am: 2dec388619
...
Change-Id: I7d59420b59cb1fd945f7edfcebe3c08b93d28473
2020-03-27 13:25:17 +00:00
TreeHugger Robot
063208c56c
Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f
am: 857392d25b
...
Change-Id: I2801d08d2ed04e7178e2a57a2a6c38994bcd33d5
2020-03-27 13:24:35 +00:00
TreeHugger Robot
857392d25b
Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f
...
Change-Id: I17c24d2ab1c3344e985f0dd8427bd74b1a3d50db
2020-03-27 13:12:13 +00:00
TreeHugger Robot
2dec388619
Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f
...
Change-Id: Ib9a43d9767a1eec78f7961f23ad9835a881d09a4
2020-03-27 13:10:59 +00:00
TreeHugger Robot
493bf6697f
Merge "Add mocked main looper to test" into rvc-dev
2020-03-27 13:00:21 +00:00
Alic Tsai
9cd2e6dd66
Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69
am: 019c186bb7
...
Change-Id: Ib218d307c7ab4b8157196a73841dc2302c4721a9
2020-03-27 12:50:21 +00:00
Alic Tsai
d4ad3f6843
Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69
am: 4d7db64de0
...
Change-Id: I990048d040bb1626a457ab8371d9482ee5053a68
2020-03-27 12:50:04 +00:00
Alic Tsai
019c186bb7
Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69
...
Change-Id: Ie74fcd532cb8ea4ed362b03f8c3b4dc54d73225c
2020-03-27 12:35:19 +00:00
Arc Wang
ebf8ffd8fd
[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib
...
Bug: 152582093
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConnectionPreferenceControllerTest
Change-Id: I9c0ab0edf5a8e935a2c1afee865bd04304ae6f0f
2020-03-27 20:34:04 +08:00