Commit Graph

62739 Commits

Author SHA1 Message Date
Pavel Grafov
6684c5c4f8 Remove unused file.
Bug: 149075700
Test: compiles
Change-Id: Iaa50a96107ca9cb4419875e4067e61a8f5d093e5
2020-04-09 12:22:01 +01:00
TreeHugger Robot
f4e34dcfdc Merge "Add metrics for the cross profile settings page" into rvc-dev am: a59df23975
Change-Id: I874bf766f77325de5f26fa04f3113ad26cf9cae5
2020-04-09 11:09:22 +00:00
TreeHugger Robot
b0ea1a81a3 Merge "Add metrics for the cross profile settings page" into rvc-dev am: a59df23975
Change-Id: I13147ab8d9b982728bb2d0f65cf300cf66340e19
2020-04-09 11:08:55 +00:00
TreeHugger Robot
a59df23975 Merge "Add metrics for the cross profile settings page" into rvc-dev 2020-04-09 10:52:11 +00:00
Arc Wang
aa6b25e137 [A11Y][Wi-Fi] Prevent data usage header spinner speak at onResume
Ignore AccessibilityEvent.TYPE_VIEW_SELECTED for the Spinner.

Bug: 146818854
Test: manual
      Should not speak for header spinner right after entering
      'Wi-Fi data usage'
Change-Id: I289d9a781242f8bfec56c59b7be2ac0688c5e485
2020-04-09 16:51:10 +08:00
Arc Wang
98c17ee49f [A11Y][Wi-Fi] Fix multiple Spinner selected speak out at once.
When users select edit a Wi-Fi and select enterprise security,
there are multiple spinner shows with a default value.
This change does not allow TalkBack to speak out for multiple
Spinner text at one user selection.

Bug: 153272108
Test: manual
      Wi-Fi Settings -> Add network -> Security spinner
      -> WPA/WPA2/WPA3-Enterprise
      TalkBack should only speak out for the Security spinner.
Change-Id: Id9ab44e4da6d7abb5168e0ab7441ee1e226f5f68
2020-04-09 15:22:26 +08:00
Automerger Merge Worker
010a56d231 Merge "[automerger skipped] Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27 -s ours am: 5fcc1340c3 -s ours" into rvc-d1-dev-plus-aosp 2020-04-09 07:01:51 +00:00
Benedict Wong
6f16ed6525 [automerger skipped] Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27 -s ours am: 5fcc1340c3 -s ours
am skip reason: Change-Id I6536652a60244c3fde3f65211f9d0709145c6cd9 with SHA-1 1c69a8282c is in history

Change-Id: Ifcf5100755adc105d4b0a00761faae1c619392a8
2020-04-09 07:01:46 +00:00
Benedict Wong
d7d7c85bc4 [automerger skipped] Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27 am: b98eac9272 -s ours
am skip reason: Change-Id I6536652a60244c3fde3f65211f9d0709145c6cd9 with SHA-1 1c69a8282c is in history

Change-Id: Iafb92d1aa2623302cc24245b471062d38517417d
2020-04-09 07:01:41 +00:00
Benedict Wong
5fcc1340c3 [automerger skipped] Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27 -s ours
am skip reason: Change-Id I6536652a60244c3fde3f65211f9d0709145c6cd9 with SHA-1 1c69a8282c is in history

Change-Id: I9d19e2f842594027dc2cbc44942d3e1995495a87
2020-04-09 06:45:24 +00:00
Benedict Wong
b98eac9272 Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27
Change-Id: I08171e64f040d1d297bcf7ae72b6fbf4f9f87ff3
2020-04-09 06:45:15 +00:00
Benedict Wong
47d4979c27 Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev 2020-04-09 06:31:49 +00:00
Bonian Chen
a7b59d6447 Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b am: 1dcc1037dd am: 272ab6b313
Change-Id: I22f34689baa89e5f0e98bf4da3859214f7893426
2020-04-09 05:49:59 +00:00
Bonian Chen
272ab6b313 Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b am: 1dcc1037dd
Change-Id: I83683ad6f287ea8a73ebf3d1b99e591976489275
2020-04-09 05:36:47 +00:00
Bonian Chen
ee2b1d1561 Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b am: 1dcc1037dd
Change-Id: Ic2c8fc4e5ef11373058b9c9b3444c3c2c0c772a5
2020-04-09 05:35:46 +00:00
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