PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,345 Commits 1 Branch 0 Tags
0776ae964242a2bc2f52c774e9f2a0e2c2f29d0c
Commit Graph

65345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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
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 is in history

Change-Id: I0841c4c0dd761d9dd4874679f84086ae02cf1437
 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
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
Xin Li
ad360f14a6 Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" 2020-04-08 06:26:03 +00:00
mincheli
5c108a0b27 Add back the entrance of magnification settings in master branch 
Bug: 146473544
Test: make RunSettingsRoboTests
Change-Id: I2e040c0b722944077dd026c32f195e5a45a52c88
 2020-04-08 14:24:59 +08:00
TreeHugger Robot
5dd64aeef2 Merge "Import translations. DO NOT MERGE" 2020-04-08 05:50:29 +00:00
Bonian Chen
21373efdf7 Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: c0c78129c8 am: 7939abdcdc am: 33cb0fa6b9 
Change-Id: Id2cff32c73a215563a349203f99f17e28fbaf8ce
 2020-04-08 05:49:40 +00:00
Bonian Chen
af151d7c75 Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: 1afdc562db am: 091a0ebc85 
Change-Id: I44d384f264e601ba8c32e43e99f36bece0549e75
 2020-04-08 05:49:21 +00:00
Bonian Chen
1e6c45adad [automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours am: 8ab7db3359 -s ours am: 7322f57974 -s ours am: 2fb82ffac9 -s ours 
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74 is in history

Change-Id: I97e493efeee62bec7e12b3d01849305917972bcd
 2020-04-08 05:49:06 +00:00
Bonian Chen
33cb0fa6b9 Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: c0c78129c8 am: 7939abdcdc 
Change-Id: I1c7e92823688311a04c717209f8ed960e56e8c8d
 2020-04-08 05:48:56 +00:00
Bonian Chen
9186d9d749 Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: a93ddbc42f am: b1b0d9981a am: e01cebc885 
Change-Id: If3d35c40f4d585ef0922fbde9e1f1301a5aaf013
 2020-04-08 05:48:45 +00:00
govenliu
a82d2c8a88 [Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need. 
The Openroaming help button should show only when the getHelpUriString() value is not null, and need to handle the click event in Settings APP.

Bug: 146669261
Test: Adjust unit test cases:
      1. make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
      2. make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I27a717c3014b01cc464908bac56f64bd08aa5da3
 2020-04-08 13:41:15 +08:00
Bonian Chen
091a0ebc85 Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: 1afdc562db 
Change-Id: Ic014fedafca2e2f491d2a26a3e2c710a27c241e3
 2020-04-08 05:35:26 +00:00
Bonian Chen
2fb82ffac9 [automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours am: 8ab7db3359 -s ours am: 7322f57974 -s ours 
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74 is in history

Change-Id: I9240656150ddbcc6ea396d1a61e504b9e1ddfb1b
 2020-04-08 05:35:20 +00:00
Bonian Chen
e01cebc885 Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: a93ddbc42f am: b1b0d9981a 
Change-Id: I11bd7298c1397f00a1ba598fc9637a88b287700b
 2020-04-08 05:35:06 +00:00