PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,970 Commits 1 Branch 0 Tags
ea2a9f2812f6233382832a597eb22d10f0a2528c
Commit Graph

64970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bonian Chen
f1b3461c3e Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae am: 2bf2b760dc am: 36fe9c2169 
Change-Id: Ibb047e96a4396c9140937d879e96a3d7123b6e5b
 2020-04-08 12:59:59 +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
TreeHugger Robot
f400f8c880 Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31 am: a1151b054a am: ab0132097f 
Change-Id: Iadb9035f1497a5cfc0b9bd178b9df1a58308bdcc
 2020-04-08 12:59:52 +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
TreeHugger Robot
24b6c52d7a Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 854559e572 am: 8985a8dc5e am: e7810dbed8 
Change-Id: I60d715295a54c86063baeccc8167ed41b8fc7e73
 2020-04-08 08:27:56 +00: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
adb10f140a Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 02ba3d1e30 am: 1a7b4d8416 am: 38581db7ad 
Change-Id: I1fa0131e3f832fe0a4ef5988b62712e4d45ad574
 2020-04-08 08:17:59 +00:00
TreeHugger Robot
acf8fc5939 Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 506a2394d0 am: 4621014df5 
Change-Id: I58a4484659736ed5541ee26fc7fc794436c590e3
 2020-04-08 08:17:51 +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
Bonian Chen
7344a5708e [automerger skipped] Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 -s ours am: 8d8e0754f4 -s ours am: eb3b228253 -s ours am: 7b069bb47c -s ours 
am skip reason: Change-Id Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157 with SHA-1 073f483d86 is in history

Change-Id: I5b92017143fde111f7134e7942bee9e9a02f6bee
 2020-04-08 07:45:54 +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 is in history

Change-Id: Ib851cd10fd6640e45ee4990642186a2e50c13f0b
 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 is in history

Change-Id: Icdafd2740e3370556d64fdffd4cf65b979887a29
 2020-04-08 07:26:05 +00:00
Xin Li
e250e08912 [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: 554b0e7845 -s ours 
am skip reason: subject contains skip directive

Change-Id: I74b46642f5de5b4f6a3543ceefcce8a903bd92c9
 2020-04-08 07:24:03 +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 is in history

Change-Id: I3b129812cbfb9d3522b90be053728edaf2cd51d1
 2020-04-08 07:11:40 +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 is in history

Change-Id: I38f5b9533f851b98e1ea5c049d12959167b05361
 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 is in history

Change-Id: I63a1cc849ca2234a166a1b6dc329203e5bd9fb7f
 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
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
Xin Li
35fb83fed6 [automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours 
am skip reason: Change-Id I1dd83ba55b34433b2b600b8a998000347b6ae5e8 with SHA-1 288fa30c2d is in history

Change-Id: Ief5bbbb7c0c3a152449580dd41a6cd0ed84b8947
 2020-04-08 06:30:50 +00:00
Bonian Chen
6ce37e3f53 [Settings] Code refactor 
Remove unused inport and adjust the import sequence.

Bug: 150352656
Test: build pass
Change-Id: Ifd1e37e56d0b0ae1d5b31723b8545ae95e707a66
 2020-04-08 14:26:46 +08:00