Automerger Merge Worker
69d8d5f676
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 am: 099416eb9a
...
Change-Id: Iddc45fb7a8dfcff092600a5001bf08dffb8bdac6
2020-04-08 22:57:21 +00:00
Goven Liu
46b44a95c7
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 am: 67f7f28b2b
...
Change-Id: I359e6503a21c0b49dd2ef50123afbc9020672560
2020-04-08 22:56:57 +00:00
Goven Liu
febabbdf12
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 am: c79dc027de
...
Change-Id: I20b647683040bb4ec371d13ac2c8749feb5882c6
2020-04-08 22:56:00 +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
c79dc027de
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: Ief4f14bcda37034527927a1400d5e55b1e8c3dd9
2020-04-08 22:42:59 +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
964cd9eb29
Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e am: a097d46cc1 am: a5b7c59126 am: 1d45b398c6 am: 7c3579433a
...
Change-Id: Id3969b30788d01936d2de5ecb0a3ec3a12f0d318
2020-04-08 20:39:01 +00:00
Treehugger Robot
7c3579433a
Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e am: a097d46cc1 am: a5b7c59126 am: 1d45b398c6
...
Change-Id: Ie937bf3c88f05aa90166e27d1ada9e29bcce9d85
2020-04-08 20:25:07 +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
Benedict Wong
e56ae928c3
Merge "Fix VPN settings UI to validate IPsec Identifier" am: 04bfcb89ad am: 3d009137d0 am: 50e94f5678 am: d10de4d52b am: a7fbdf5a01
...
Change-Id: Icfa13a74c21fd399cb45a2c3b2c7b140c30382e1
2020-04-08 19:41:56 +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
a7fbdf5a01
Merge "Fix VPN settings UI to validate IPsec Identifier" am: 04bfcb89ad am: 3d009137d0 am: 50e94f5678 am: d10de4d52b
...
Change-Id: If931a8048bd7dfc09825873efc1b143512dca1f5
2020-04-08 19:27:14 +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
9a8991d861
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58 am: 95784202e7 am: f1f1074034 am: e42f692e5e
...
Change-Id: I01c09c6ce49173b01c9b785747da798b5fddbb1f
2020-04-08 16:07:39 +00:00
TreeHugger Robot
bbd74728b6
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: bc7986e92b am: 5eb509284a am: d118023b1d
...
Change-Id: Ic2594245b50924e00c36c88b915977cb1319d058
2020-04-08 16:07:33 +00:00
TreeHugger Robot
e42f692e5e
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58 am: 95784202e7 am: f1f1074034
...
Change-Id: I2801529a8a6935ac3b5576cc05c3129141536862
2020-04-08 16:07:22 +00:00
TreeHugger Robot
d2774334aa
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58 am: b7c70e141a am: 3803f40c26
...
Change-Id: If8e743b89bcfee32ab087fd0a0514aa7afe17c19
2020-04-08 16:07:22 +00:00
TreeHugger Robot
d118023b1d
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: bc7986e92b am: 5eb509284a
...
Change-Id: I26455df29e717b7e86bb92ee7e7a3b0d4c01741a
2020-04-08 15:49:20 +00:00
TreeHugger Robot
3803f40c26
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58 am: b7c70e141a
...
Change-Id: I0e2ddf8a46eea94b0888ab25850393aa4b474754
2020-04-08 15:49:12 +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
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
71ca2bd1c0
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae am: 2544f3762f am: c88f8b8e40 am: 1ae72ddb9a
...
Change-Id: I3b417ce827c8db96ef6503e6b6cade8bbae3c68c
2020-04-08 13:00:32 +00:00
TreeHugger Robot
c2ffd39807
Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31 am: 2321c0aded am: d37ed99ac3 am: a641ce15b9
...
Change-Id: I842e05a392ab13cd9ba0895b0e9abc89efffcfd8
2020-04-08 13:00:22 +00:00
Bonian Chen
67da24c324
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: cc225237ed am: d429e9404d am: cc00b9fba0
...
Change-Id: I6cf337cb8015ff83098d351e286d845e85ac812f
2020-04-08 13:00:15 +00:00
Automerger Merge Worker
45d4933e86
Merge "Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: 0affb4891f" into rvc-d1-dev-plus-aosp am: 313d455754 am: 5a1728cdc2
...
Change-Id: I99efee5b5a465c4a3295f5c769c4573e4d62bac4
2020-04-08 13:00:07 +00:00
Bonian Chen
1ae72ddb9a
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae am: 2544f3762f am: c88f8b8e40
...
Change-Id: I3aa9f4f85862e5c32b4bae0c98120acb25642c73
2020-04-08 13:00:00 +00:00
Bonian Chen
f1b3461c3e
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae am: 2bf2b760dc am: 36fe9c2169
...
Change-Id: Ibb047e96a4396c9140937d879e96a3d7123b6e5b
2020-04-08 12:59:59 +00:00
TreeHugger Robot
a641ce15b9
Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31 am: 2321c0aded am: d37ed99ac3
...
Change-Id: Icc059bfda6b7df88ed62cf50be1f1dbe0ad72d7c
2020-04-08 12:59:54 +00:00
TreeHugger Robot
f400f8c880
Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31 am: a1151b054a am: ab0132097f
...
Change-Id: Iadb9035f1497a5cfc0b9bd178b9df1a58308bdcc
2020-04-08 12:59:52 +00:00
Bonian Chen
cc00b9fba0
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: cc225237ed am: d429e9404d
...
Change-Id: If69b071dd4559b4e010a4a4856972bcd03a13974
2020-04-08 12:48:02 +00:00
Automerger Merge Worker
5a1728cdc2
Merge "Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: 0affb4891f" into rvc-d1-dev-plus-aosp am: 313d455754
...
Change-Id: I02401be2126c8645d16027c02b6728dca117fc52
2020-04-08 12:47:55 +00:00
