PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,555 Commits 1 Branch 0 Tags
a5b7c5912618f5af1ce558be1ae1a27fe9ee72fb
Commit Graph

60555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a5b7c59126 Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e am: a097d46cc1 
Change-Id: I32e0e450ed8d7becb966071a50b7ad3ecfdf058c
 2020-04-08 20:03:09 +00:00
Treehugger Robot
a097d46cc1 Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e 
Change-Id: I266d033b676aebf682028a4ae01570cb1d3accd1
 2020-04-08 19:48:40 +00:00
Treehugger Robot
8889d6012e Merge "Show footer to notify user no 5G in DSDS mode." 2020-04-08 19:33:21 +00:00
Benedict Wong
50e94f5678 Merge "Fix VPN settings UI to validate IPsec Identifier" am: 04bfcb89ad am: 3d009137d0 
Change-Id: If8da943c64f8d665f36b0ab8c4d92a0516640d0c
 2020-04-08 18:48:25 +00:00
Benedict Wong
3d009137d0 Merge "Fix VPN settings UI to validate IPsec Identifier" am: 04bfcb89ad 
Change-Id: I218940123509c1ee9864bd026a9bce721c60b41a
 2020-04-08 18:31:14 +00:00
Benedict Wong
04bfcb89ad Merge "Fix VPN settings UI to validate IPsec Identifier" 2020-04-08 18:08:19 +00:00
Bonian Chen
b3e2be170f Show footer to notify user no 5G in DSDS mode. 
(Cherry pick part of I5df95528aae12b43a15389b8048f14d9508272f3)

Bug: 151657272
Test: build pass
Change-Id: Iedfa26b320480cf4b606293c39a3ac94da1ad1fa
Merged-In: Iedfa26b320480cf4b606293c39a3ac94da1ad1fa
 2020-04-08 17:55: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
e886ef9e9a Merge "Update display logic for no shared data." into rvc-dev 2020-04-08 15:11:37 +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
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
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
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
TreeHugger Robot
1e49ff8ba7 Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev 2020-04-08 07:23:53 +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
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
Xin Li
ad360f14a6 Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" 2020-04-08 06:26:03 +00:00
Bonian Chen
8ab7db3359 [automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours 
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74 is in history

Change-Id: Id59f155e4e5368d776b5103514bf4e6072438cd9
 2020-04-08 05:21:24 +00:00
Bonian Chen
c034169ccd Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b 
Change-Id: I36f17b8206bd397306dca9d37e2bd3cf48700321
 2020-04-08 05:08:49 +00:00
Bonian Chen
a93ddbc42f Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 
Change-Id: I793ec6eca3bab04122ebcd5e6a957d16fe14f5e0
 2020-04-08 05:03:17 +00:00
Bonian Chen
4e8786c09b Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." 2020-04-08 04:57:12 +00:00
Bonian Chen
05cb60b258 Merge "[Settings] Code refactor" into rvc-dev 2020-04-08 04:52:23 +00:00
Arc Wang
067757f8d9 [Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2 
PreferenceGroup in a controller is not in a RecyclerView,
TalkBack loses focus after PreferenceGroup#removeAll.

To fix it, only add/remove the preference if it's necessary.

Bug: 153278854
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsPreferenceController2Test
Change-Id: Ie9ad5481c33865dce2b7db04d0f969b1f49b80e1
 2020-04-08 11:58:27 +08:00
Bonian Chen
9be78b056f [automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 -s ours 
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62 is in history

Change-Id: I220736e2850a956d44d441270755d4edcce9757a
 2020-04-08 03:54:23 +00:00
Bonian Chen
b35536dda8 Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c 
Change-Id: I3c8fb5dc82165f42e6bee5742cddc48d934684ed
 2020-04-08 03:41:01 +00:00
Bonian Chen
ca4d249fc9 Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 
Change-Id: Id483c51c2eb4589c873a49ab8c77f9f6eaca12f7
 2020-04-08 03:36:18 +00:00
tim peng
fa54aab4d1 Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e 
Change-Id: Ia747117acf1a8d2e7a77049a013fb777e1ab64b9
 2020-04-08 03:36:11 +00:00
tim peng
778317679a Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 
Change-Id: I5cd836d2390ad92e2c7a1afb7973186327bfc98b
 2020-04-08 03:36:04 +00:00
Bonian Chen
bb9fbb60f0 Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev 2020-04-08 03:23:09 +00:00
Bonian Chen
449f76d55c Merge "[Settings] Changes for supporting replacing ImsManager" 2020-04-08 03:20:43 +00:00
tim peng
e189ac522e Merge "Settings crashed by a null worker" into rvc-dev 2020-04-08 03:18:31 +00:00
tim peng
f1f7b861d9 Merge "Transferring to a cast device should not close the output switcher" into rvc-dev 2020-04-08 03:18:09 +00:00
TreeHugger Robot
7b22b09804 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a -s ours am: f97c675cde -s ours 
am skip reason: subject contains skip directive

Change-Id: I60a47c45f4494f7f5e3b396a7176bce00b2f5c31
 2020-04-08 00:50:14 +00:00
TreeHugger Robot
f97c675cde [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a -s ours 
am skip reason: subject contains skip directive

Change-Id: I5197f84d818588ccb3e3686b32c5e0beb12c1463
 2020-04-08 00:36:53 +00:00
Bill Yi
54f6c923d8 [automerger skipped] Import translations. DO NOT MERGE am: ae901dc181 -s ours am: 2d031a2068 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6bcb1265f56308386c9b54e25b5b34be5b74e375
 2020-04-08 00:24:54 +00:00
TreeHugger Robot
5064d96e3a Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-04-08 00:18:18 +00:00
Bill Yi
2d031a2068 [automerger skipped] Import translations. DO NOT MERGE am: ae901dc181 -s ours 
am skip reason: subject contains skip directive

Change-Id: Idc1bb3593dba2931cfe035fcca47b88a48767866
 2020-04-08 00:10:43 +00:00
TreeHugger Robot
b9bf1df5cb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iaa869049896bbb5fc23e52be0739779b1cc9affe
 2020-04-07 23:50:25 +00:00
Menghan Li
231b8ae707 Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56 
Change-Id: Id8ee5d83613b1e8c22f757781799aa4a18bcae98
 2020-04-07 23:50:16 +00:00
TreeHugger Robot
18f56af885 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-07 23:47:28 +00:00
Menghan Li
a43f842c56 Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev 2020-04-07 23:40:09 +00:00
Bill Yi
31e944a20a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I5302a1941d87bc6bc89039c91b5e4799f94259ec
 2020-04-07 15:50:51 -07:00
Bill Yi
4bd0afa73b [automerger skipped] Import translations. DO NOT MERGE am: ea107980f0 -s ours 
am skip reason: subject contains skip directive

Change-Id: I820e94c8ae8d947aace33c995a3db9b444cbd77d
 2020-04-07 22:43:45 +00:00