Fiona Campbell
7f434778a3
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 am: 87f9d9aff7
...
Change-Id: I3d4831c635c380d1d28b74e5739e7604bbbdc5f1
2020-03-23 09:47:22 +00:00
Fiona Campbell
5d6a3e4551
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 am: 878097999a
...
Change-Id: I4d3db08d01db9fa650bff590871d286d1130fc7a
2020-03-23 09:47:04 +00:00
Fiona Campbell
ff3539af2c
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: a165e13de0
...
Change-Id: I750710d381c728552d16f7b87aacf5ca673ced31
2020-03-23 09:30:48 +00:00
Fiona Campbell
878097999a
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531
...
Change-Id: I7fa774d4e6c21f722c804325d864f1955db5f3ba
2020-03-23 09:30:14 +00:00
Fiona Campbell
87f9d9aff7
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531
...
Change-Id: I3b876975c5b706b181ff2ab56f41a0b03a45a17d
2020-03-23 09:29:43 +00:00
youtengliang
aa4f582931
Modify close app function.
...
Test: atest com.android.settings.tests.perf
Change-Id: Ia504dd1185de1d33a21fec344871d4b0fabae953
2020-03-23 09:29:28 +00:00
Fiona Campbell
a165e13de0
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2
...
Change-Id: Ia2626e63c27344c591b8a54b8cec8bf0973e020e
2020-03-23 09:04:51 +00:00
Fiona Campbell
9eae2b7531
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2
...
Change-Id: Ia027a69fd2e739aba88335a208644d9be663163b
2020-03-23 09:04:26 +00:00
Fiona Campbell
9a712271f2
Merge "Fix displayed brightness value in settings." into rvc-dev
2020-03-23 08:54:26 +00:00
Eric Sandness
1e8ba370b4
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: a4ad84f5e5 am: 8edf583e84 am: 956761d827
...
Change-Id: I337d52a88ff6a1b7639a7ee768bcf687cf0093bc
2020-03-23 08:50:33 +00:00
Eric Sandness
c3697ef915
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 0d022fced2 am: 731399ddf3 am: b8d59b391a
...
Change-Id: I7541f708592777e705eb3ea49ff7235fc3caed56
2020-03-23 08:50:19 +00:00
Eric Sandness
956761d827
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: a4ad84f5e5 am: 8edf583e84
...
Change-Id: If1dbdadeba6232fdbb195940d2f225920ab22158
2020-03-23 08:50:11 +00:00
Eric Sandness
077047738f
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: 0bf7413ff2 am: 1a50bf5f6f
...
Change-Id: Ie81292b994e769fac375f96eaa47f06de071f377
2020-03-23 08:49:46 +00:00
Eric Sandness
b8d59b391a
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 0d022fced2 am: 731399ddf3
...
Change-Id: I29966ec027b89542a114d1261c36bce2029056aa
2020-03-23 08:36:45 +00:00
Eric Sandness
1a50bf5f6f
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: 0bf7413ff2
...
Change-Id: I64428774b339457575d283bfd7e521b40b26bf19
2020-03-23 08:36:21 +00:00
Eric Sandness
8edf583e84
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: a4ad84f5e5
...
Change-Id: I25ee9d5552c16570778dfc1346782d810639c78e
2020-03-23 08:36:17 +00:00
Arc Wang
fafcd3b362
[Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
...
Some tests are removed because WifiTracerLib listens to most intents
and callbacks to Settings APP, most of the receiving intent tests are
removed.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ie726938b7c6e94bbaf6479f6a8797a92d869ba8c
2020-03-23 16:21:07 +08:00
Eric Sandness
a4ad84f5e5
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a
...
Change-Id: Iad0129b7d3628cc2ddbe0510f855c4861bf3f99a
2020-03-23 08:19:15 +00:00
Eric Sandness
731399ddf3
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 0d022fced2
...
Change-Id: If5a2be4cdf1c2466db2c7358b99096521f9df493
2020-03-23 08:19:06 +00:00
Eric Sandness
0bf7413ff2
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a
...
Change-Id: Ie8144a556fa767e274ececbeb58f87844cdd31a9
2020-03-23 08:18:48 +00:00
Eric Sandness
0d022fced2
Make Logic For Selecting Title Layout Consistent am: b02952a5d3
...
Change-Id: Ie91236f0ec08795a7db45baf98844fc10fcb4dcb
2020-03-23 07:55:47 +00:00
Eric Sandness
6d9451891a
Make Logic For Selecting Title Layout Consistent am: b02952a5d3
...
Change-Id: I3477638565f28b5ca4848fec6f85e8f4ea7a3e67
2020-03-23 07:55:09 +00:00
Bonian Chen
b995c5ab03
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 am: cc337985fc am: ce862691d8 am: aee7a88349
...
Change-Id: Ibeab21c024ca6297dfb373df7fd3a4e869dc1c42
2020-03-23 07:48:26 +00:00
Bonian Chen
aee7a88349
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 am: cc337985fc am: ce862691d8
...
Change-Id: I11ba6e84c9022bf5d33aa0e1fa79ab863e8441b2
2020-03-23 07:35:14 +00:00
Bonian Chen
943011c7ea
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ca9e69e2b am: db6759d985 am: e33f976301
...
Change-Id: I8d09631ac45e65ec41e6d6a47d26299fafc1d1f4
2020-03-23 07:17:29 +00:00
Bonian Chen
7c4b785a83
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 am: caaae4627e am: 928ddce1f0
...
Change-Id: Ie611255390be747ee6282a310f2f9924a7361d0d
2020-03-23 07:15:54 +00:00
Bonian Chen
e33f976301
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ca9e69e2b am: db6759d985
...
Change-Id: I1737797c17cde52ccb7fb601105f6289b46e88de
2020-03-23 07:08:54 +00:00
Bonian Chen
928ddce1f0
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 am: caaae4627e
...
Change-Id: I59472621fa3f658c1f3d6c112a153a4d939917e3
2020-03-23 07:08:44 +00:00
Bonian Chen
ce862691d8
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 am: cc337985fc
...
Change-Id: I793d224dc5dd8486f953143483f908e70e8baba5
2020-03-23 07:08:43 +00:00
Treehugger Robot
7c62cbd97e
Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0
...
Change-Id: I6b363bd609d580d547cb59851f5bfaba57ef7154
2020-03-23 07:08:39 +00:00
Bonian Chen
db6759d985
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ca9e69e2b
...
Change-Id: I78758d62bdb3a86cca1379e73f28cd5c7ac283a9
2020-03-23 06:55:04 +00:00
Bonian Chen
cc337985fc
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910
...
Change-Id: Ieb3e0265d29897b667f21db301b6fc0943e87a67
2020-03-23 06:55:02 +00:00
Bonian Chen
caaae4627e
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910
...
Change-Id: I659ecc4aae14fcb0bbba8af558c65adabb566bed
2020-03-23 06:54:36 +00:00
Treehugger Robot
036496e2d0
Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7
...
Change-Id: I52b931de8009f876020bdebe867d178962829e88
2020-03-23 06:47:44 +00:00
Bonian Chen
3ca9e69e2b
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
...
Change-Id: I13bdb4cb0a9cf1cc8b7f9930a50a016d208acae3
2020-03-23 06:36:27 +00:00
Bonian Chen
3ebf728910
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
...
Change-Id: I61ecd339475067337dc1d58ec5ac24da1036377b
2020-03-23 06:35:54 +00:00
Treehugger Robot
b301288cd7
Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b
...
Change-Id: I6a04bfbb044435e987d4f141b98e457de35e9e14
2020-03-23 06:25:45 +00:00
Eric Sandness
b02952a5d3
Make Logic For Selecting Title Layout Consistent
...
Align the logic for selecting between the setup and non-setup versions
of the lock screen settings title layout, with the logic used in
ChooseLockGeneric. This means using
WizardManagerHelper.isAnySetupWizard, rather than
WizardManagerHelper.isDeviceProvisioned.
Fixes: 151552453
Test: Manually verify screens in consumer setup, enterprise setup, and
Settings app
Change-Id: I75cd9e509320b9ef9b929dd592f16e8130d80a6e
2020-03-23 06:25:07 +00:00
Bonian Chen
31315e4172
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev
2020-03-23 06:20:42 +00:00
Treehugger Robot
456b2bf87b
Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5
...
Change-Id: Id2bbc0a3596bb9a82ea066dc512b206dd8f8b7a1
2020-03-23 06:18:45 +00:00
calvinpan
8c6218013d
Clear the entries in updateState
...
When user select the prefer network type that will also invoke
updateState(), so need to clear the entries to prevent adding duplicate
item.
Bug: 152031192
Test: By manual.
Change-Id: I05c5eae658cf72bdf05f5007b4aeba575ab14d61
2020-03-23 14:09:54 +08:00
Treehugger Robot
cbe5bbdcd5
Merge "Fixed NullPointerException" am: 5fb16be925
...
Change-Id: Ie99fc2139875e0f8dfbfbe0bd31f55f135607996
2020-03-23 06:00:05 +00:00
Treehugger Robot
5fb16be925
Merge "Fixed NullPointerException"
2020-03-23 05:45:38 +00:00
TreeHugger Robot
4d8c2a068e
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c am: 637a548baa am: a6f85fc927 am: 5020254ef2
...
Change-Id: Ia4d48ae568618949291d10359657b99cd90190ef
2020-03-23 03:36:30 +00:00
Automerger Merge Worker
6cb994b13b
Merge "Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c" into rvc-d1-dev-plus-aosp am: f6465f9aa8 am: cf7d7145ad
...
Change-Id: I3971af369e12170eea2cc844401a1f9a15c66fc3
2020-03-23 03:35:48 +00:00
TreeHugger Robot
5020254ef2
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c am: 637a548baa am: a6f85fc927
...
Change-Id: I02397e02e26bda10939b767c9e22fd36d7d23f99
2020-03-23 03:34:57 +00:00
TreeHugger Robot
c24801b26b
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: d582019b63 am: 742539e288 am: 22c2b61ee2
...
Change-Id: Iefc7917e2fcc485fe5cdc784795b5be31f8d44aa
2020-03-23 03:34:47 +00:00
Automerger Merge Worker
cf7d7145ad
Merge "Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c" into rvc-d1-dev-plus-aosp am: f6465f9aa8
...
Change-Id: I1e0472f8e01cedbf634624580f0af297bb60449a
2020-03-23 03:18:36 +00:00
TreeHugger Robot
22c2b61ee2
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: d582019b63 am: 742539e288
...
Change-Id: I5c3b5a8539d7ed79e883dbf486a3ced0f7fcaee3
2020-03-23 03:18:06 +00:00
TreeHugger Robot
a6f85fc927
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c am: 637a548baa
...
Change-Id: Ia08c737da781a74bb96dcb9abeebf8d0fdd8ff88
2020-03-23 03:17:25 +00:00
