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

63689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oscar Shu
821b8f2240 Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350 am: b210bd43fc am: 92a71c6591 
Change-Id: I55f21c12af3df8affbc3a0020dd3925d1b08c9f2
 2020-04-09 18:04:20 +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
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
e992536746 Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a am: f1895785f1 am: e5a6f6e2c6 am: c3c0d36477 
Change-Id: Ia9e0a74e217c7539d4ade055975b2eee9ee936b4
 2020-04-09 17:46:37 +00:00
TreeHugger Robot
d1b0e3280e Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a am: ea62443e38 am: b167268cac 
Change-Id: I690108626607a30358911aee3599eb248219fe0b
 2020-04-09 17:26:33 +00:00
TreeHugger Robot
f8d2cfb236 Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a am: f1895785f1 am: 88b26ebffd 
Change-Id: Ib2bb66a71eef36f8b06cceec7578bdd67dbbec4c
 2020-04-09 17:26:28 +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
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
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
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
TreeHugger Robot
997de55747 Merge "Remove unused file." into rvc-dev am: 493c841a3a am: 4a00690e81 am: 73c2325106 am: 14cb52e092 
Change-Id: Idc9bc3bed4bb0bb7e37201e03a365d12002ed3fd
 2020-04-09 14:22:37 +00:00
TreeHugger Robot
a573815b5c Merge "Remove unused file." into rvc-dev am: 493c841a3a am: e0767c012e am: 096af0924d 
Change-Id: I9a316130aaf5a827263c93649aa23d09045421cb
 2020-04-09 14:07:14 +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
TreeHugger Robot
cb8d189082 Merge "Remove unused file." into rvc-dev am: 493c841a3a am: 4a00690e81 am: 2382945442 
Change-Id: Id4a68bd35b24f521b04c41e17ebdb807edec2f2c
 2020-04-09 14:07:04 +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
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
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
9fd9f2f0ea Merge "Add metrics for the cross profile settings page" into rvc-dev am: a59df23975 am: f4e34dcfdc am: ae3594ae8a am: 1cd7587521 
Change-Id: Iaef2075dfaf2f6ce09479be0229b12a1e726852c
 2020-04-09 12:10:53 +00:00
TreeHugger Robot
4f5265d5c0 Merge "Add metrics for the cross profile settings page" into rvc-dev am: a59df23975 am: b0ea1a81a3 am: e55afe59ca 
Change-Id: Icb377b6bb96d11199a248a757186e1eca907dd3a
 2020-04-09 11:43:39 +00:00
TreeHugger Robot
106efe7eac Merge "Add metrics for the cross profile settings page" into rvc-dev am: a59df23975 am: f4e34dcfdc am: adae52d4cc 
Change-Id: If8bda608c0379170f0e0d3abbe4e6a43c3b957dd
 2020-04-09 11:43:27 +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
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
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
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
Benedict Wong
e8d8347521 [automerger skipped] Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27 am: b98eac9272 am: 0f77f25e8d am: d0b0bdae89 -s ours 
am skip reason: Change-Id I6536652a60244c3fde3f65211f9d0709145c6cd9 with SHA-1 3bd20b6bc9 is in history

Change-Id: Ieba1af2793d422a2c52572970e75fcfce6d15cea
 2020-04-09 07:27:36 +00:00
Automerger Merge Worker
7249525346 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 am: 010a56d231 -s ours 
am skip reason: Change-Id I6536652a60244c3fde3f65211f9d0709145c6cd9 with SHA-1 3bd20b6bc9 is in history

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

Change-Id: I4f80d2aec43ac5c1164d15b8c685a9473493b3d7
 2020-04-09 07:14:04 +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
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
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
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
726ec47c6a Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b am: 1dcc1037dd am: 272ab6b313 am: a7b59d6447 
Change-Id: I91cce946c6ef7d1bbdff8e021e5e71fe21c6dfc5
 2020-04-09 06:07:28 +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