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
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
3ebf728910
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
...
Change-Id: I61ecd339475067337dc1d58ec5ac24da1036377b
2020-03-23 06:35:54 +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
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
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
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
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
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
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
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
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
Arc Wang
263930d8b4
[Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
...
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: Id88a5c9276457e329840e72711bd06e51a03dd1f
2020-03-23 09:42:35 +08:00
Stanley Wang
bfaf9af026
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3 am: 3277ad0cf6
...
Change-Id: Ic8a90fee9e0e5741046b17762161062bc140d049
2020-03-21 06:27:58 +00:00
Stanley Wang
adc4662924
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0 am: 83d06ef1f4
...
Change-Id: Ia58b6202a8e5abba5b39a0887ee491ffd8679ada
2020-03-21 06:27:19 +00:00
Stanley Wang
3277ad0cf6
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3
...
Change-Id: Ida303b4590886c38e90f8e233920db186102269f
2020-03-21 06:05:27 +00:00
Stanley Wang
83d06ef1f4
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0
...
Change-Id: Ib375c8aee3658797113370493feb7e7d527a8939
2020-03-21 06:04:18 +00:00
Stanley Wang
76c2ec77e3
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
...
Change-Id: I35d894cd31031fa8019ca7b6f1552dcd0b1c1412
2020-03-21 05:49:13 +00:00
Stanley Wang
a8d78418c0
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
...
Change-Id: I87df8f40a569b89d2275d5ce38e379eb3f9f96b9
2020-03-21 05:48:43 +00:00
Stanley Wang
fb39c70875
Merge "Update Settings subtexts for R." into rvc-dev
2020-03-21 05:30:25 +00:00
Stanley Wang
61e7d2c24c
Merge "Update Settings strings for R." into rvc-dev
2020-03-21 05:30:00 +00:00
TreeHugger Robot
c8fcfd82d9
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3baeb593c7
...
Change-Id: I42a007cfacde7d1ae1fc91220866afe8fd13538b
2020-03-21 03:56:12 +00:00
TreeHugger Robot
3baeb593c7
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285
...
Change-Id: I193e8c5cb34efe53d9b62953fe8c3cddca485707
2020-03-21 03:39:45 +00:00
TreeHugger Robot
17c6211285
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
...
Change-Id: I5b2b39c33b525407b1b6da300dc853704f727061
2020-03-21 03:14:30 +00:00
TreeHugger Robot
a4e3d5ef8b
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev
2020-03-21 02:58:15 +00:00
TreeHugger Robot
60dfe57f61
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167 am: 10b3981f72
...
Change-Id: Ic40439ac6621949dc7a00be354adf0a04bd2cddd
2020-03-21 02:24:51 +00:00
TreeHugger Robot
10b3981f72
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167
...
Change-Id: I26026f93904a147300c843625170d2585d68b910
2020-03-21 02:14:16 +00:00
TreeHugger Robot
cdca282167
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
...
Change-Id: I52415cc41bf4e613a63459394579265e27c87c76
2020-03-21 01:56:41 +00:00
TreeHugger Robot
785e3f26bd
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev
2020-03-21 01:39:29 +00:00
Mady Mellor
b299e0a543
String updates
...
Test: treehugger
Bug: 151965589
Change-Id: Ibba6f9440aaa495c6197d3862a5e8224d026bb6b
2020-03-21 01:11:51 +00:00
Malcolm Chen
b56fea748f
Add text showing in Settings footer that 5G may not be capable in DSDS.
...
Bug: 151657272
Test: build
Change-Id: Ieeb0787f76fcf41cc55e85ef8bf375dd77c9d6b5
2020-03-20 16:14:14 -07:00
Julia Reynolds
94b04df4b4
Redesign individual conversation page
...
Test: atest
Fixes: 151765526
Change-Id: I98d45222104eb03449e469bcd80fd5f23c2935ca
2020-03-20 18:34:24 -04:00
Stanley Wang
58f9ae3096
Update Settings strings for R.
...
Bug:143267842
Test: Rebuilt rom and saw different screens.
Change-Id: Id2d89287fe36240d71de2092daac44a5da9be282
(cherry picked from commit 8694c34e09
2020-03-20 22:31:44 +00:00
Joshua Duong
d910baf535
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a am: c6e68b5830
...
Change-Id: Ia4874ceb7cd3ea04595bda9dc30eca71b325764c
2020-03-20 19:44:35 +00:00
Joshua Duong
6e2635d11e
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306 am: 8017331f64
...
Change-Id: I0de8b2ce35b1b6a9526b89051fc9b404b4a9cd05
2020-03-20 19:44:32 +00:00
Beverly
e65db314f1
Update DND people Settings pages
...
Settings > Sound > Do Not Disturb > People
- Redesign of messages + calls settings pages
- Redesign of conversations page
- Added strings for Apps page
Test: make RunSettingsRoboTests7
Bug: 151845457
Change-Id: I58d22a31c398418c053e06a4c6bf5ed8c482ee35
2020-03-20 19:37:59 +00:00
Joshua Duong
c6e68b5830
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a
...
Change-Id: I869608c3ed88f6dfe3d3a3b8eb08ea03a278861b
2020-03-20 19:15:46 +00:00
Joshua Duong
8017331f64
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306
...
Change-Id: I9293a4340a3e73db11c79c8874340d507d745b87
2020-03-20 19:15:45 +00:00
Joshua Duong
6fcb6b356a
Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958
...
Change-Id: I90616c087e665c1d6980b9b6ac76f5f3d37be506
2020-03-20 19:04:50 +00:00
Joshua Duong
6efa33e306
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782
...
Change-Id: I3d3ab0f1b54cef538b8bbc75c48c187a631f9742
2020-03-20 19:04:48 +00:00
Joshua Duong
f5ff928958
Merge "Add visibility control to ADB QR code preference." into rvc-dev
2020-03-20 19:02:49 +00:00
Joshua Duong
2f7a77b782
Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev
2020-03-20 19:02:49 +00:00
TreeHugger Robot
c892944075
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours am: 8a3c90359e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ac3e3e7d32d788896970716c161262aaf6f7808
2020-03-20 18:38:44 +00:00
TreeHugger Robot
8a3c90359e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ae49f68605be4f91a35202a0f18ae70101139bd
2020-03-20 18:12:49 +00:00
TreeHugger Robot
feaa91837a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I56114e77ffad0fe5b9ab7683624332406138bdf5
2020-03-20 17:45:32 +00:00
TreeHugger Robot
65fb5c31c2
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-20 17:24:57 +00:00
Beverly
509273cc03
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
Merged-In: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
2020-03-20 17:12:55 +00:00
TreeHugger Robot
72cc464ad8
Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: 8e0807a069 am: 7868ba726f
...
Change-Id: I1e3dfa272a8762701aafd9b9afc920b17900a8de
2020-03-20 17:07:03 +00:00
