Commit Graph

60948 Commits

Author SHA1 Message Date
Oscar Shu
099f99cab6 Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350 am: b210bd43fc am: 0f5d9150e8
Change-Id: Iadc83c9c21951b0ce4ec16b90c7d5e4cc0e7c3f5
2020-04-09 18:00:59 +00:00
Oscar Shu
0f5d9150e8 Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350 am: b210bd43fc
Change-Id: Ib295a5490b7c0c83b8cddfe9ec9c8ea0d21c58d1
2020-04-09 17:59:11 +00:00
Oscar Shu
b210bd43fc Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350
Change-Id: I02b105bf9cb119bdf341aff76177ff106aa2027f
2020-04-09 17:53:13 +00:00
Oscar Shu
a6eedbf350 Merge "Add dev option for enhanced mac randomization" into rvc-dev 2020-04-09 17:50:58 +00:00
TreeHugger Robot
c3c0d36477 Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a am: f1895785f1 am: e5a6f6e2c6
Change-Id: I8e93716262b2c492215d45577ca2d5b72d505890
2020-04-09 17:26:18 +00:00
TreeHugger Robot
e5a6f6e2c6 Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a am: f1895785f1
Change-Id: I5e4b0b5159fbba3127fe3e976dc5a3656bf71efe
2020-04-09 17:10:12 +00:00
TreeHugger Robot
f1895785f1 Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a
Change-Id: I51c72d1cb7da275c32a1ff9bc184ebde685826e9
2020-04-09 16:57:55 +00:00
TreeHugger Robot
9c10b9c03a Merge "Update "important" conversations to "priority"" into rvc-dev 2020-04-09 16:48:18 +00:00
TreeHugger Robot
14cb52e092 Merge "Remove unused file." into rvc-dev am: 493c841a3a am: 4a00690e81 am: 73c2325106
Change-Id: I8c5ab652d5142454501fec7183094567db7955ff
2020-04-09 14:07:06 +00:00
Beverly
9c622a85a4 Update "important" conversations to "priority"
To maintain consistency between Conversation settings pages and
conversation notification guts text.

Test: manual
Fixes: 153624868
Change-Id: I58cd80403e8bdff32722c95ab8ac2278604ea3dd
2020-04-09 13:57:14 +00:00
TreeHugger Robot
73c2325106 Merge "Remove unused file." into rvc-dev am: 493c841a3a am: 4a00690e81
Change-Id: Ie45ea181f64b12e6c790bf6452f4c95e0bd8bca2
2020-04-09 13:53:47 +00:00
TreeHugger Robot
4a00690e81 Merge "Remove unused file." into rvc-dev am: 493c841a3a
Change-Id: Ib6357e2044b45a096fde4d6cd74502b5062f1914
2020-04-09 13:44:06 +00:00
TreeHugger Robot
493c841a3a Merge "Remove unused file." into rvc-dev 2020-04-09 13:28:21 +00:00
TreeHugger Robot
1cd7587521 Merge "Add metrics for the cross profile settings page" into rvc-dev am: a59df23975 am: f4e34dcfdc am: ae3594ae8a
Change-Id: I1d07ffb9d4e39022d872e3cc7b3deb26191c069e
2020-04-09 11:43:07 +00:00
TreeHugger Robot
ae3594ae8a Merge "Add metrics for the cross profile settings page" into rvc-dev am: a59df23975 am: f4e34dcfdc
Change-Id: Ib651ac834c874148374091794fc13ce15d65db9f
2020-04-09 11:23:54 +00:00
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
a59df23975 Merge "Add metrics for the cross profile settings page" into rvc-dev 2020-04-09 10:52:11 +00:00
Benedict Wong
d0b0bdae89 Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27 am: b98eac9272 am: 0f77f25e8d
Change-Id: Icf7380b013488bee7ca17a46f503c393e8d081fe
2020-04-09 07:14:03 +00:00
Benedict Wong
0f77f25e8d Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27 am: b98eac9272
Change-Id: I8be7785b38d99ae9463d0a190c91b126c2c8dc88
2020-04-09 07:01:51 +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
TreeHugger Robot
11bc56b99d Merge "Add ellipsis to dnd notification settings" into rvc-dev am: c8aae85e06 am: 3dc88504b6 am: 8f7ff04d7f
Change-Id: I2a01d89c1411edf89d018c6f671f18a9185be5cc
2020-04-09 03:07:55 +00:00
TreeHugger Robot
8f7ff04d7f Merge "Add ellipsis to dnd notification settings" into rvc-dev am: c8aae85e06 am: 3dc88504b6
Change-Id: I592787504c07773a119f4c0eb6580e5f8e43d59c
2020-04-09 02:52:34 +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
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
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
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
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
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
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
18997b6dae Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a
Change-Id: Ie9fa3c09327df4404544f00e3ebbdbcfe06abfb6
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
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
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
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