TreeHugger Robot
b7c70e141a
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58
...
Change-Id: Ia9861edf1808b7fa5fa1eab0ab67fc2c81cf91d4
2020-04-08 15:34:25 +00:00
TreeHugger Robot
bc7986e92b
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a
...
Change-Id: I95e826289036439674c19c52b1871d1820d06cac
2020-04-08 15:21:41 +00:00
TreeHugger Robot
b0171b6a58
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a
...
Change-Id: I3a9cfaa21188906acb440216314cf412bf3221ed
2020-04-08 15:21:33 +00:00
TreeHugger Robot
e886ef9e9a
Merge "Update display logic for no shared data." into rvc-dev
2020-04-08 15:11:37 +00:00
Beverly
56a7e26e90
Add ellipsis to dnd notification settings
...
To indicate there's more text than showing.
Test: manual
Fixes: 152901378
Change-Id: Iefb688b07a301be09e0ab747429d2b99b49ea1a6
2020-04-08 14:38:26 +00:00
Rubin Xu
f535e87e51
Improve work profile unification flow
...
When unifying work profile challenge, keep the device lock
as long as it will still meet password requirement after unification.
If not, prompt the user to set a new device lock and only unify
work challenge after a compliant device lock is set.
Bug: 148630506
Fix: 149682344
Test: make RunSettingsRoboTests
ROBOTEST_FILTER='ChooseLockGenericTest|ChooseLockPasswordTest|ChooseLockPatternTest|LockUnificationPreferenceControllerTest'
Change-Id: I99cde2650902927f6a4cc7c0cc7c6016e0dc283f
2020-04-08 14:43:48 +01:00
Bonian Chen
1ae72ddb9a
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae am: 2544f3762f am: c88f8b8e40
...
Change-Id: I3aa9f4f85862e5c32b4bae0c98120acb25642c73
2020-04-08 13:00:00 +00:00
TreeHugger Robot
a641ce15b9
Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31 am: 2321c0aded am: d37ed99ac3
...
Change-Id: Icc059bfda6b7df88ed62cf50be1f1dbe0ad72d7c
2020-04-08 12:59:54 +00:00
Bonian Chen
cc00b9fba0
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: cc225237ed am: d429e9404d
...
Change-Id: If69b071dd4559b4e010a4a4856972bcd03a13974
2020-04-08 12:48:02 +00:00
Automerger Merge Worker
5a1728cdc2
Merge "Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: 0affb4891f" into rvc-d1-dev-plus-aosp am: 313d455754
...
Change-Id: I02401be2126c8645d16027c02b6728dca117fc52
2020-04-08 12:47:55 +00:00
Bonian Chen
36fe9c2169
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae am: 2bf2b760dc
...
Change-Id: Ided44c014a04bcac96812ad256b346aca67fa388
2020-04-08 12:47:47 +00:00
Bonian Chen
c88f8b8e40
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae am: 2544f3762f
...
Change-Id: I0686297193ec32565f56e496bbbf1cee021a8020
2020-04-08 12:47:33 +00:00
TreeHugger Robot
ab0132097f
Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31 am: a1151b054a
...
Change-Id: I1a3827734fac4ffa2cf454b3a3688f2bb8eb1a71
2020-04-08 12:47:27 +00:00
TreeHugger Robot
d37ed99ac3
Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31 am: 2321c0aded
...
Change-Id: Ia7b96d94e72a1a7f997a3a998dd952e443b4c853
2020-04-08 12:47:26 +00:00
Bonian Chen
d429e9404d
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: cc225237ed
...
Change-Id: Ib3ea9f1e8663341561379c866d25e77746bd7952
2020-04-08 12:38:36 +00:00
Bonian Chen
2544f3762f
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae
...
Change-Id: I8465c1034e2401c6f685321661d1bc560d667896
2020-04-08 12:38:27 +00:00
Automerger Merge Worker
313d455754
Merge "Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: 0affb4891f" into rvc-d1-dev-plus-aosp
2020-04-08 12:38:26 +00:00
TreeHugger Robot
c953300830
Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: 0affb4891f
...
Change-Id: I64782df23a1d3319d523cd66a05da9b42357e5b2
2020-04-08 12:38:22 +00:00
TreeHugger Robot
2321c0aded
Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31
...
Change-Id: I5f8c22753cd8a767a41893673a02f1290bd49d6b
2020-04-08 12:38:18 +00:00
Bonian Chen
2bf2b760dc
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae
...
Change-Id: I8675ee0929257cfa817ad3c15f88cc973dfd1d07
2020-04-08 12:38:17 +00:00
TreeHugger Robot
a1151b054a
Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31
...
Change-Id: If694cd4f9706a4fcf2d5a0f3e583c3ac9dcf66cd
2020-04-08 12:38:07 +00:00
Bonian Chen
cc225237ed
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a
...
Change-Id: I9258611ddac1431abd0093372331c04616e0a6ca
2020-04-08 12:19:32 +00:00
Bonian Chen
18997b6dae
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a
...
Change-Id: Ie9fa3c09327df4404544f00e3ebbdbcfe06abfb6
2020-04-08 12:19:23 +00:00
TreeHugger Robot
0affb4891f
Merge "Update string to Android security update" into rvc-dev am: f10afc071f
...
Change-Id: I1a6535c3c0f328b9a57e9693be0f492c941f8a10
2020-04-08 12:19:23 +00:00
TreeHugger Robot
cf485a9b31
Merge "Update string to Android security update" into rvc-dev am: f10afc071f
...
Change-Id: I127edfd51a04449945bda3262ef3de4c201de026
2020-04-08 12:19:08 +00:00
Bonian Chen
c1b20e631a
Merge "[Settings] Code refactor" into rvc-dev
2020-04-08 12:12:04 +00:00
TreeHugger Robot
f10afc071f
Merge "Update string to Android security update" into rvc-dev
2020-04-08 12:05:59 +00:00
Mill Chen
3cde287564
Update string to Android security update
...
For consistency with Mainline, we changed the string from Android
security patch level to Android security update.
Fixes: 151841551
Test: robotests
Change-Id: I6e53cef54add7f5f00b9766a5f2e9fdea9a62dd5
2020-04-08 09:08:01 +00:00
calvinpan
a971c458ba
Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode
...
Add is5gEntryDisplayed() check in in NETWORK_MODE_LTE_GSM_WCDMA mode to
prevent that show "LTE(recommand)" everytime.
Bug: 153301072
Test: By manual
1. Reproduce issue
2. Verify the patch
Change-Id: I96311a1e399efd160a3f7290f85df778b2d6f0c4
2020-04-08 16:58:56 +08:00
TreeHugger Robot
e7810dbed8
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 854559e572 am: 8985a8dc5e
...
Change-Id: I1912b454b9eec6b7c188b239a8bf1a87491c119a
2020-04-08 08:18:06 +00:00
TreeHugger Robot
38581db7ad
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 02ba3d1e30 am: 1a7b4d8416
...
Change-Id: If202df6764a9dc25c92bd93f8e1e0ca5a625380e
2020-04-08 07:57:39 +00:00
TreeHugger Robot
4621014df5
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 506a2394d0
...
Change-Id: If23c5ebcbea0eac3376596aeaa2d12cd68a5de85
2020-04-08 07:57:32 +00:00
TreeHugger Robot
8985a8dc5e
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 854559e572
...
Change-Id: I0680df9e735908abed0f73752966f44ea118f020
2020-04-08 07:57:28 +00:00
TreeHugger Robot
1a7b4d8416
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 02ba3d1e30
...
Change-Id: Ic2441347cbaeb8bedda4b5caee0605994545cc4b
2020-04-08 07:46:06 +00:00
TreeHugger Robot
854559e572
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277
...
Change-Id: Icc5688817560e1db448357bfd7a62cd184236ef8
2020-04-08 07:46:03 +00:00
TreeHugger Robot
506a2394d0
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277
...
Change-Id: I00572d5c7dd3905f094fdd052ebf76aea7fcb774
2020-04-08 07:45:52 +00:00
TreeHugger Robot
02ba3d1e30
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7
...
Change-Id: I376352c94fac2b8fcf9f20e0d176e17efdfdbdfc
2020-04-08 07:38:19 +00:00
Bonian Chen
7b069bb47c
[automerger skipped] Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 -s ours am: 8d8e0754f4 -s ours am: eb3b228253 -s ours
...
am skip reason: Change-Id Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157 with SHA-1 073f483d86
2020-04-08 07:38:11 +00:00
TreeHugger Robot
800cc2c277
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7
...
Change-Id: Iafb889858cd911b7b684eb92d09344ac7371e1f3
2020-04-08 07:38:10 +00:00
Bonian Chen
eb3b228253
[automerger skipped] Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 -s ours am: 8d8e0754f4 -s ours
...
am skip reason: Change-Id Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157 with SHA-1 073f483d86
2020-04-08 07:26:05 +00:00
TreeHugger Robot
1e49ff8ba7
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev
2020-04-08 07:23:53 +00:00
Xin Li
554b0e7845
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours am: 35fb83fed6 -s ours am: 01c50b7bc6 -s ours am: 63468ecd9e -s ours
...
am skip reason: Change-Id I1dd83ba55b34433b2b600b8a998000347b6ae5e8 with SHA-1 288fa30c2d
2020-04-08 07:11:40 +00:00
Bonian Chen
df97bbbdd5
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086
...
Change-Id: I5a1a3d423103971c0978e9e7dbdad216b398a159
2020-04-08 07:11:00 +00:00
Bonian Chen
8d8e0754f4
[automerger skipped] Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 -s ours
...
am skip reason: Change-Id Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157 with SHA-1 073f483d86
2020-04-08 07:10:56 +00:00
Xin Li
63468ecd9e
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours am: 35fb83fed6 -s ours am: 01c50b7bc6 -s ours
...
am skip reason: Change-Id I1dd83ba55b34433b2b600b8a998000347b6ae5e8 with SHA-1 288fa30c2d
2020-04-08 06:59:02 +00:00
Bonian Chen
733530e086
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b
...
Change-Id: If4f0e4b0c0d44ee6b7387a4a94c44d949706c557
2020-04-08 06:56:14 +00:00
Xin Li
242b3e6d37
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours am: 35fb83fed6 -s ours
...
am skip reason: Change-Id I1dd83ba55b34433b2b600b8a998000347b6ae5e8 with SHA-1 288fa30c2d
2020-04-08 06:41:17 +00:00
Xin Li
01c50b7bc6
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours am: 35fb83fed6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I85a3023bc4b1ac9758a0a87b933296f11b978904
2020-04-08 06:40:46 +00:00
Bonian Chen
fe22ecad9b
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API"
2020-04-08 06:40:10 +00:00
Bonian Chen
d9957643d9
[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API
...
Replace SubscriptionManager#addOnSubscriptionsChangedListener API in
order to compatible with legacy design.
Bug: 151838951
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionsChangeListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157
Merged-In: I350604a64a56151195f52d38bd258e34c76e40c5
Change-Id: I4fc89e91381b1562ee7e2f48cfc159949c81a414
2020-04-08 06:38:10 +00:00
