Commit Graph

64562 Commits

Author SHA1 Message Date
TreeHugger Robot
721e029b0a Merge "Update DND strings and image spacing" into rvc-dev am: e1ba740cd8 am: 71f088666a am: 8310f3a01b
Change-Id: I50d651acc11535a636d00b2173f8b4dec750a9e5
2020-04-09 23:14:00 +00:00
Vince Leung
7d6c329746 Use super method for Vibration preferences
onDisplayPreferenceDialog is overriden to handle BT related preferences
but VibrationPreferences require the super method of
onDisplayPreferenceDialog. Therefore if VibrationPreferences wants to
display a dialog, use the super method instead of the overriden method.

Bug: 150661723
Change-Id: I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b
Merged-In: I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b
(cherry picked from commit eb27aefa32)
2020-04-09 23:01:40 +00:00
TreeHugger Robot
21982bccb5 Merge "Update DND strings and image spacing" into rvc-dev am: e1ba740cd8 am: 71f088666a
Change-Id: I28c08d249fe81a5f26df77fe7ae3b5c8bb2042a4
2020-04-09 22:53:03 +00:00
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
3c50ac18cd Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2 am: 03fcf4849a am: 456fceb583 am: 1579f01810
Change-Id: I0005a5f4c37449e867ee91551b45f94eac5177b9
2020-04-09 18:17:15 +00:00
Oscar Shu
dbec9d118c Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350 am: b210bd43fc am: 0f5d9150e8 am: 099f99cab6
Change-Id: I862a4e828a8a070889adea29279a196f2ddbe3da
2020-04-09 18:16:33 +00:00
Fabian Kozynski
1579f01810 Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2 am: 03fcf4849a am: 456fceb583
Change-Id: I6a703fa9f9c1dd38ba6ec8c039d1905343029a89
2020-04-09 18:15:08 +00:00
Fabian Kozynski
ea8226bffc Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2 am: f8832f0a88 am: cc920a7048
Change-Id: I13f2d882642b6a54e27778bb2cd2c0ac95babef0
2020-04-09 18:15:03 +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
b86716bf98 Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2 am: 03fcf4849a am: 553666ff75
Change-Id: Ia952e8fd2d35cb83d956d979e330a7e992f7c7e1
2020-04-09 18:05: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
456fceb583 Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2 am: 03fcf4849a
Change-Id: Iaf51f70227924711748a2485d87b74238e8b0765
2020-04-09 18:04:31 +00:00
Oscar Shu
8ea6fe22a0 Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350 am: 87d4a7d593 am: b3d3f52c73
Change-Id: I509ce45782e378927c294eb1ed42b95f31a48e48
2020-04-09 18:04:31 +00:00
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
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
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
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
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
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
menghanli
bff36f7e8c Sets the scroll indicators for edit shortcut dialog.
- The indicators appears while content view is out of vision for vertical scrolling.

Bug: 142531156
Test: local test
Change-Id: Ifa1966b1df7628029976d27d72d2ae63d84e28c3
2020-04-10 00:32:04 +08:00
Beverly
ecc377bab8 Update DND strings and image spacing
Test: manual
Bug: 153428950
Change-Id: I25ff7432d6e22224fd1922f097fdd5bdf9ef9a5a
2020-04-09 14:32:26 +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