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
tim peng
daf6921c6b
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 am: f76f1f41ee am: 5d30497d73 am: 328e909489
...
Change-Id: I57541d2632087b086a9c84ce8a5c43bd0800b446
2020-03-23 03:04:08 +00:00
Automerger Merge Worker
f6465f9aa8
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
2020-03-23 03:04:02 +00:00
TreeHugger Robot
47c78f4f72
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c
...
Change-Id: Ia60fb17751ca5520b4b733c30312cb992696f02e
2020-03-23 03:03:57 +00:00
TreeHugger Robot
742539e288
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: d582019b63
...
Change-Id: I94f44d842f761994649ba7ca1e0211c2c0a4cea4
2020-03-23 03:03:54 +00:00
tim peng
328e909489
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 am: f76f1f41ee am: 5d30497d73
...
Change-Id: I03869e5f5ab9e252411e98c3cd2dd7ab27665a8f
2020-03-23 03:03:50 +00:00
tim peng
68c7a2e375
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: f51bd0decb am: a58a21ff01 am: 919f4f0a5b
...
Change-Id: I3d43ec5b8fa2156231e9e552e5f57297657ce9ae
2020-03-23 03:03:45 +00:00
TreeHugger Robot
637a548baa
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c
...
Change-Id: I7feb5a370c5a80a6d78a2a418c31ada4f8d63a28
2020-03-23 03:03:44 +00:00
tim peng
3e6ef24d82
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 am: 7b1b527b13 am: a1185b6c2c
...
Change-Id: Ie16d2387ab802a185233a5122e2d9ead133e6c37
2020-03-23 03:02:58 +00:00
TreeHugger Robot
8e19b032b2
Merge "Updates main page for Do Not Disturb"
2020-03-23 02:52:46 +00:00
TreeHugger Robot
d582019b63
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b
...
Change-Id: I2573e4a5f478a60bc07424dec42b828ccb6e642e
2020-03-23 02:42:30 +00:00
TreeHugger Robot
7f0a093f5c
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b
...
Change-Id: Icc3236048ae0cd07f4bb623bc59830332813584b
2020-03-23 02:41:45 +00:00
tim peng
919f4f0a5b
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: f51bd0decb am: a58a21ff01
...
Change-Id: I18e82a465478c5b5346fa64146c9f9bc30c60ce1
2020-03-23 02:41:29 +00:00
tim peng
5d30497d73
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 am: f76f1f41ee
...
Change-Id: Ib299a6fdb5c49873fd2c64cce9edc7fe0a046aa3
2020-03-23 02:41:07 +00:00
tim peng
a1185b6c2c
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 am: 7b1b527b13
...
Change-Id: Iaf4221ca0bcb2e74ea166d917fca5c62fc1397c0
2020-03-23 02:41:07 +00:00
tim peng
a58a21ff01
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: f51bd0decb
...
Change-Id: I4935e45a9193949275f5300ee33e9cf421bc8079
2020-03-23 02:14:15 +00:00
tim peng
f76f1f41ee
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200
...
Change-Id: I2da55a8a664d165be81f5fe82ac3bb4d1fb52b65
2020-03-23 02:14:04 +00:00
tim peng
7b1b527b13
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200
...
Change-Id: I81fae7c73c5bd96aabcae7156e0fef98a49ed633
2020-03-23 02:13:40 +00:00
TreeHugger Robot
dea87bd85b
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev
2020-03-23 02:07:56 +00:00
tim peng
f51bd0decb
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1
...
Change-Id: I2406caf1ecdb217658c310f4db948c627adcf790
2020-03-23 01:59:00 +00:00
tim peng
30bc781200
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1
...
Change-Id: I07b28fccc7cc1285506c18b5579350fbdcca23e2
2020-03-23 01:58:34 +00:00
tim peng
f8f1b271b1
Merge "Update header information in output switcher" into rvc-dev
2020-03-23 01:47:25 +00:00
Beverly
5cfb5aa52d
Updates main page for Do Not Disturb
...
Settings > Sound > Do Not Disturb
- Update strings, more descriptive summary for DND Apps summary
- Move top-level ordering of preferences
- Remove old unused DND strings
Test: make RunSettingsRoboTests7
Test: make ROBOTEST_FILTER=ZenModeBypassingAppsPreferenceControllerTest RunSettingsRoboTests
Test: manual
Bug: 151845457
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
2020-03-23 01:41:45 +00:00
Stanley Wang
6ce9be0f96
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3 am: 3277ad0cf6 am: bfaf9af026 am: c97b40924b
...
Change-Id: I0e7c94c953b732821ff083b731207976e3469322
2020-03-21 06:48:23 +00:00
Stanley Wang
815411c78d
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0 am: 83d06ef1f4 am: adc4662924 -s ours am: 5bedf5a2dd -s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
2020-03-21 06:48:17 +00:00
Stanley Wang
f9c7231f32
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 78e9bdf9b7 am: ef2bc18b14 am: f6d654d16a
...
Change-Id: I3859c8b4b1c6fb60d36630f4f3662d932ff9f140
2020-03-21 06:48:10 +00:00
