PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,124 Commits 1 Branch 0 Tags
b88227a353669dea2d64fa0c9c65fe2fd3640cd6
Commit Graph

63124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
1dcc1037dd Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b 
Change-Id: I532654e3c3a5650ff36963b0e2172a66ec39baa5
 2020-04-09 05:22:20 +00:00
Bonian Chen
61e003440b Merge "[Settings] Refactor of Wifi Calling part" 2020-04-09 05:04:15 +00:00
TreeHugger Robot
6f2962bd73 Merge "Add ellipsis to dnd notification settings" into rvc-dev am: c8aae85e06 am: 5c1dc40dee 
Change-Id: I1c9e22976b4672c573a7625de0678c6b855828e7
 2020-04-09 02:53:11 +00:00
TreeHugger Robot
4f9a27edc7 Merge "Add ellipsis to dnd notification settings" into rvc-dev am: c8aae85e06 am: 3dc88504b6 
Change-Id: Ia585330fa0652664d57378246815372258af760a
 2020-04-09 02:52:38 +00:00
TreeHugger Robot
5c1dc40dee Merge "Add ellipsis to dnd notification settings" into rvc-dev am: c8aae85e06 
Change-Id: I15b11409a617684c2c5e154dc4e0b8ea13645986
 2020-04-09 02:31:17 +00:00
TreeHugger Robot
3dc88504b6 Merge "Add ellipsis to dnd notification settings" into rvc-dev am: c8aae85e06 
Change-Id: I2e2059a38269a1c1f672ea429f5ba01ff77100a7
 2020-04-09 02:30:58 +00:00
TreeHugger Robot
c8aae85e06 Merge "Add ellipsis to dnd notification settings" into rvc-dev 2020-04-09 02:19:39 +00:00
Benedict Wong
3bd20b6bc9 Fix VPN settings UI to validate IPsec Identifier 
This change ensures that the updateUiControls() (and validate()
transitively) is called whenever the IPsec identifier is updated.

Bug: 152811464
Test: Manual testing with settings UI
Change-Id: I6536652a60244c3fde3f65211f9d0709145c6cd9
Merged-In: I6536652a60244c3fde3f65211f9d0709145c6cd9
(cherry picked from commit e56ae928c3)
 2020-04-09 02:19:32 +00:00
Bonian Chen
5042276cf7 [Settings] Refactor of Wifi Calling part 
Refactor of Wifi Calling to avoid accessing hidden APIs.
This includes the following cherry-picks on the corresponding files:
I455685eb26df69d929ff3ed3c26ce84aa5f6b1f8
I1a67db80b114a438afda7d45af90e54af38703c3
Idd4935a6d8ceed77c15e90f96781014d1940a427
Ia5179ee1a23f054899bc74c796542bae40cdc8d5
I57c91a095fc4d454d92e8d78e0b647b4f098c6a3
I8a09264f83b9fc4fce3f79ec3aeb6ae757b004e4
I68462368669b81e10d09bbb93e74e23ea9a1f446
I9c54eb63a0df3fde38965ee7e2ae46cc1b7efd47
I0d5dcfc33b0bddacf059d1fb9af559646e32e68a
I45977c850977be84c0dc1f6461e68a1941efc1a2
I46c047359257ddd5cb3e331add4856b01c5c9739
I35246811d3e01d0b2ca197e9a1ed7081691cd982

Bug: 140542283
Test: build pass
Change-Id: I2cddeefb7cc5f1b2060e572a73560f7cd6204d0b
 2020-04-09 01:35:07 +00:00
Automerger Merge Worker
099416eb9a Merge "Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a am: c23f06f079" into rvc-d1-dev-plus-aosp 2020-04-08 22:43:02 +00:00
Goven Liu
93c691ca54 Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a am: c23f06f079 
Change-Id: Ib337093de80430dca1bd18d2debf96ee5c8306b8
 2020-04-08 22:42:57 +00:00
Goven Liu
67f7f28b2b Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a am: e5153b50f6 
Change-Id: Ia32ef3337b59ba5207182d1e15c717fa0ded012d
 2020-04-08 22:42:49 +00:00
Goven Liu
c23f06f079 Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a 
Change-Id: Id1c48c08e3e141b207488e3a86e9a7542ed53e6a
 2020-04-08 22:42:34 +00:00
Goven Liu
e5153b50f6 Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a 
Change-Id: I029733e8a768a097c6eaf513566772c375d6073f
 2020-04-08 22:42:28 +00:00
Goven Liu
5a8e9e452a Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev 2020-04-08 22:37:35 +00:00
Treehugger Robot
1d45b398c6 Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e am: a097d46cc1 am: a5b7c59126 
Change-Id: Icc0d145d39a1fd471fa22032b2ec143975447598
 2020-04-08 20:12:58 +00:00
Treehugger Robot
56c6ff781c Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e am: a097d46cc1 
Change-Id: I8edb12c3ebf05675148bbb10c35a675c00bd4570
 2020-04-08 20:03:25 +00:00
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
d10de4d52b Merge "Fix VPN settings UI to validate IPsec Identifier" am: 04bfcb89ad am: 3d009137d0 am: 50e94f5678 
Change-Id: I461db5fbd0aa9982125575289094bc31c45a9e86
 2020-04-08 19:07:54 +00:00
Benedict Wong
c59e006104 Merge "Fix VPN settings UI to validate IPsec Identifier" am: 04bfcb89ad am: 3d009137d0 
Change-Id: If088e0e493884197fbc45c8006e028f7315f17a2
 2020-04-08 18:49:12 +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
5eb509284a Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: bc7986e92b 
Change-Id: Ie05b1fe0ed346ffba1bf612661f885ab2788f171
 2020-04-08 15:34:36 +00:00
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
d429e9404d Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: cc225237ed 
Change-Id: Ib3ea9f1e8663341561379c866d25e77746bd7952
 2020-04-08 12:38:36 +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
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
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
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
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