Commit Graph

19621 Commits

Author SHA1 Message Date
George Chang
270ea3400b Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a
Change-Id: Iae7ec5f9d2cb9a59ea2dbaf65dcb3bcc8bbbb7aa
2020-04-13 03:18:31 +00:00
George Chang
5a6d05885a Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7
Change-Id: I96469f4d0938d9f5f913ee531d4e5e72a11a7ed4
2020-04-13 02:59:05 +00:00
George Chang
0181643bb7 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev 2020-04-13 02:43:35 +00:00
George Chang
28895f2822 [NFC] Disable contactless payments when no payment application installed
Bug: 153821082
Bug: 149270345
Test: Check settings
Change-Id: I5162ecb07c26a33427305b6cf65829b2c61ad317
2020-04-13 01:53:23 +00:00
TreeHugger Robot
29b22263c5 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-11 22:43:33 +00:00
Bill Yi
e5a75d999f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I4b655b05c1ffe6c5ecd9878216dfbf50b173692c
2020-04-11 12:38:18 -07:00
Bill Yi
f4fdb7aa6f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ib326e867526a7b49d3134265abf3edc8293bb5f5
2020-04-11 12:06:30 -07:00
TreeHugger Robot
f95f9c9392 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-10 23:57:05 +00:00
TreeHugger Robot
a4225ef524 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-10 22:40:51 +00:00
Joshua Duong
2ae802aa4a Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360
Change-Id: I65671fb805807b23762954038061d7baedf8aac2
2020-04-10 22:12:20 +00:00
Joshua Duong
7a0fbe20c2 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360
Change-Id: Ifef0847142df532101d1abfb51903ddd2f126fcc
2020-04-10 22:10:39 +00:00
Joshua Duong
99eeb00360 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev 2020-04-10 21:59:02 +00:00
Bill Yi
249b249162 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I8edf2232bd374be619ac31a6c2b71342c4023b62
2020-04-10 14:09:45 -07:00
Bill Yi
2ee020144e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ie37a263449cc464c87062240472b94c9eda01ca2
2020-04-10 13:36:56 -07:00
Beverly
1e640f4608 Fix padding on DND settings header am: 32f2839703
Change-Id: I9aa8f7541b5ee23deec088b13a492ee6ead83461
2020-04-10 19:44:57 +00:00
Beverly
504f43c8fb Fix padding on DND settings header am: 32f2839703
Change-Id: Id37351280a62f1f42727f5707883ad02f80e68cc
2020-04-10 19:43:36 +00:00
Joshua Duong
0f3eba36f2 [adbwifi] Add qstile for wireless debugging.
Bug: 153275926

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingTest
Change-Id: I6b381a7e29beec5c9c345b374e127caabdb674db
(cherry picked from commit 0c23d39f94)
Exempt-From-Owner-Approval: cherry-pick
2020-04-10 19:12:40 +00:00
Beverly
32f2839703 Fix padding on DND settings header
Test: manual
Fixes: 152974082
Change-Id: Id34db63550ddc2ad89c15830e03bf9782df0a765
2020-04-10 12:30:57 -04:00
Menghan Li
698b8f1f87 Merge "Sets the scroll indicators for edit shortcut dialog." into rvc-dev am: 417011c6f7
Change-Id: I7c9d24b0d4377fac0e622bec05c1107db9050c9a
2020-04-10 06:33:20 +00:00
Menghan Li
e98d4b9971 Merge "Sets the scroll indicators for edit shortcut dialog." into rvc-dev am: 417011c6f7
Change-Id: I95f2bf776250c5b31e54b2ea6203b22ae1c315cf
2020-04-10 06:31:30 +00:00
Menghan Li
417011c6f7 Merge "Sets the scroll indicators for edit shortcut dialog." into rvc-dev 2020-04-10 05:21:54 +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
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
03fcf4849a Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2
Change-Id: I877c64bc8692186ba63ea69c6a65b022b9eaeb5e
2020-04-09 17:59:58 +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
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
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
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
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
Pavel Grafov
6684c5c4f8 Remove unused file.
Bug: 149075700
Test: compiles
Change-Id: Iaa50a96107ca9cb4419875e4067e61a8f5d093e5
2020-04-09 12:22:01 +01: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
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
TreeHugger Robot
0affb4891f Merge "Update string to Android security update" into rvc-dev am: f10afc071f
Change-Id: I1a6535c3c0f328b9a57e9693be0f492c941f8a10
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
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