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

64645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f1f1074034 Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58 am: 95784202e7 
Change-Id: I345084140b6b406f9c6b4e2ce41337c242ed5e1a
 2020-04-08 15:49:03 +00:00
TreeHugger Robot
95784202e7 Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58 
Change-Id: I659f336987b2c798ece95f6ba27d689cad33a20e
 2020-04-08 15:34:38 +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
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
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
2544f3762f Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae 
Change-Id: I8465c1034e2401c6f685321661d1bc560d667896
 2020-04-08 12:38:27 +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
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
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
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
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
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
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
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
android-build-team Robot
019c9ff20e Snap for 6374617 from d9f883293c to mainline-release 
Change-Id: I991e2b5a9b11a42d6acd298ab8d63226026e82e4
 2020-04-08 07:08:21 +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
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
7939abdcdc Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: c0c78129c8 
Change-Id: I62468efd3412cebe9bcaf843d29178f9441819b5
 2020-04-08 05:34:54 +00:00
Bonian Chen
c0c78129c8 Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee 
Change-Id: I0738d3cac701a396f334ace6b0a6ea309bd11c13
 2020-04-08 05:21:36 +00:00
Bonian Chen
9d1b047e4c Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd 
Change-Id: I928f1223c983a6ffcfae75cdf193779a7e688a60
 2020-04-08 05:21:31 +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
403c8aa4ee Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 
Change-Id: I59eea93d852d4397306099e14c202c795761a446
 2020-04-08 05:03:08 +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
Bonian Chen
d9fadefbe3 Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: 9140b1d29f am: 03e935f435 
Change-Id: If482e609b9b7d043082af4c06ad0f31b3bbcda2d
 2020-04-08 04:04:32 +00:00
tim peng
21ca7a4348 Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 76b3da3eee 
Change-Id: I6611149863e814988ec4d7f6252517a60f1cf538
 2020-04-08 04:04:27 +00:00
tim peng
a789813202 Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 6e423144e7 
Change-Id: I4296dce2d19f8615be409884fc04057d0b7427b2
 2020-04-08 04:04:07 +00:00