Commit Graph

61822 Commits

Author SHA1 Message Date
TreeHugger Robot
44f8b0dba8 Merge "Update DND strings and image spacing" into rvc-dev am: e1ba740cd8 am: 8d79cdbe01
Change-Id: Ia2787c2140cde76ea16e59c2a2aede35896d0e98
2020-04-09 22:52:57 +00:00
TreeHugger Robot
8310f3a01b Merge "Update DND strings and image spacing" into rvc-dev am: e1ba740cd8 am: 71f088666a
Change-Id: I9ca7c61133d85c2a6c082066d367cd44ac9a3b51
2020-04-09 22:51:48 +00:00
TreeHugger Robot
71f088666a Merge "Update DND strings and image spacing" into rvc-dev am: e1ba740cd8
Change-Id: I014ff7211e9c2ce67993d3faa9b4d5bc50c9b2db
2020-04-09 22:31:08 +00:00
TreeHugger Robot
8d79cdbe01 Merge "Update DND strings and image spacing" into rvc-dev am: e1ba740cd8
Change-Id: I2d6b97bdf16b1dd5ed1b4306c201043ac3c2a6e6
2020-04-09 22:19:50 +00:00
TreeHugger Robot
e1ba740cd8 Merge "Update DND strings and image spacing" into rvc-dev 2020-04-09 21:56:33 +00:00
Fabian Kozynski
cc920a7048 Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2 am: f8832f0a88
Change-Id: I7f5f4dc68b6a706d2f46fe302b2cde30c4d185be
2020-04-09 18:11:10 +00:00
Fabian Kozynski
f8832f0a88 Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2
Change-Id: If61285544336d341cf225549f9eb273a12df764d
2020-04-09 18:04:50 +00:00
Fabian Kozynski
553666ff75 Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2 am: 03fcf4849a
Change-Id: I810a8cc02159bb87d0f0c4997c1610cc0b9dcf8f
2020-04-09 18:04:49 +00:00
Fabian Kozynski
03fcf4849a Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2
Change-Id: I877c64bc8692186ba63ea69c6a65b022b9eaeb5e
2020-04-09 17:59:58 +00:00
Oscar Shu
b3d3f52c73 Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350 am: 87d4a7d593
Change-Id: I392c0d431bb21a1d555320730c00269e8d1de431
2020-04-09 17:58:56 +00:00
Fabian Kozynski
4d02f7b2e2 Merge "Added settings screens for Power Menu" into rvc-dev 2020-04-09 17:58:44 +00:00
Oscar Shu
92a71c6591 Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350 am: b210bd43fc
Change-Id: I5e0ec5a4f0d3d789d941a9077bab691b80196b3f
2020-04-09 17:58:44 +00:00
Oscar Shu
87d4a7d593 Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350
Change-Id: I1a6c49d9ba076a474ad99cfc9231e0eb5eecaf1c
2020-04-09 17:57:02 +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
b167268cac Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a am: ea62443e38
Change-Id: Ib89181ef9f59dd5b2f0e155cdacb0dcc2892854e
2020-04-09 17:10:22 +00:00
TreeHugger Robot
88b26ebffd Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a am: f1895785f1
Change-Id: I8a6dbef9deec7f488d374b79431195709b4d4140
2020-04-09 17:10:02 +00:00
TreeHugger Robot
ea62443e38 Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a
Change-Id: I996ecfc42af4aee00f1e1d8ff3265455edaffd68
2020-04-09 16:58:02 +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
Beverly
ecc377bab8 Update DND strings and image spacing
Test: manual
Bug: 153428950
Change-Id: I25ff7432d6e22224fd1922f097fdd5bdf9ef9a5a
2020-04-09 14:32:26 +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
096af0924d Merge "Remove unused file." into rvc-dev am: 493c841a3a am: e0767c012e
Change-Id: Ided2646804d6c5914ace2296abe77549823941c1
2020-04-09 13:53:49 +00:00
TreeHugger Robot
2382945442 Merge "Remove unused file." into rvc-dev am: 493c841a3a am: 4a00690e81
Change-Id: I7c33492b07142445901c191957fd77de3fdeb424
2020-04-09 13:53:36 +00:00
TreeHugger Robot
e0767c012e Merge "Remove unused file." into rvc-dev am: 493c841a3a
Change-Id: I1cbbd17beb7a7e3cc3d6009218dca52f34efaa13
2020-04-09 13:44:16 +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
e55afe59ca Merge "Add metrics for the cross profile settings page" into rvc-dev am: a59df23975 am: b0ea1a81a3
Change-Id: I0aaade11732fcb77aec4ca443cfde15e577e6dec
2020-04-09 11:24:41 +00:00
TreeHugger Robot
adae52d4cc Merge "Add metrics for the cross profile settings page" into rvc-dev am: a59df23975 am: f4e34dcfdc
Change-Id: I231102ada6984d8dda0034f24fd604c337409308
2020-04-09 11:24:33 +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
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
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
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