Commit Graph

61070 Commits

Author SHA1 Message Date
android-build-team Robot
a5a5d62fa2 Snap for 6389733 from 36d89020d1 to mainline-release
Change-Id: I67d7fa8a273699bf569880fa8377a8d730d572d4
2020-04-13 07:05:49 +00:00
TreeHugger Robot
36d89020d1 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf am: 5c35333116
Change-Id: If31b02a752fe4dee2fbe8979c66372aad8baf447
2020-04-13 03:39:03 +00:00
George Chang
45c71c6223 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a am: 1cfa1b1208
Change-Id: Ib32ae836ec369ba317fb967d804c88671861fb81
2020-04-13 03:38:56 +00:00
TreeHugger Robot
5c35333116 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf
Change-Id: I308a6ff8149fccd6fca0a301978c88b836c0cf6d
2020-04-13 03:20:16 +00:00
George Chang
1cfa1b1208 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a
Change-Id: Id356d8ea6af7b1e655b5964c4920bf1dde18f9e4
2020-04-13 03:20:08 +00:00
TreeHugger Robot
a287641adf Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f
Change-Id: Id19154bf9ae37556f4d2284cb4168a76405aeb83
2020-04-13 02:59:19 +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
TreeHugger Robot
c56bcb5e7f Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev 2020-04-13 02:45:04 +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
84559ccf8f Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 am: 0260b6bc92
Change-Id: I4121edd2128f1c451b508b12be4460b280de8191
2020-04-13 01:30:59 +00:00
TreeHugger Robot
0260b6bc92 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3
Change-Id: I05c0cf2645d1780e40f82d34c39506c83bde43da
2020-04-13 01:13:01 +00:00
TreeHugger Robot
35d8c0bdb3 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872
Change-Id: Ifbd95c73fd5e862163157fd7cab49ff4c0a12ddd
2020-04-13 00:48:10 +00:00
TreeHugger Robot
545f08e872 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev 2020-04-13 00:28:11 +00:00
Robert Luo
afb01f12cd Fix NFC UI is not available when switching to 2nd user
Bug: 152581438
Test: (1) make -j42 RunSettingsRoboTests (2) check NFC UI and function work as 2nd user
Change-Id: Ibf0346b992406c1d6329580083c1cd49180376cf
2020-04-12 15:27:18 +08:00
android-build-team Robot
dc093d7951 Snap for 6388478 from 11ab1464c4 to mainline-release
Change-Id: Ibe05a2dfd9dc86fe1ddbaacfabcdf46305d102f5
2020-04-12 07:09:51 +00:00
TreeHugger Robot
11ab1464c4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours am: e7c0cff6a0 -s ours
am skip reason: subject contains skip directive

Change-Id: I65d0dc38fc54ff8153f644ff57f41f0740654c5b
2020-04-11 23:18:49 +00:00
TreeHugger Robot
e7c0cff6a0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours
am skip reason: subject contains skip directive

Change-Id: I0c8c5a3623151dea336dfae92932e6e769d43853
2020-04-11 23:00:39 +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
0a7e821da3 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours am: e19e364142 -s ours
am skip reason: subject contains skip directive

Change-Id: I50388f6dbcc68d80fb6e95da50ba1857f2db09fb
2020-04-11 22:06:46 +00:00
Bill Yi
e19e364142 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours
am skip reason: subject contains skip directive

Change-Id: Ia6ba2667a8981b0a655bba90c23611d043d5a1a4
2020-04-11 21:43:50 +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
c341afd2d4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f95f9c9392 -s ours am: 8dcd33f953 -s ours
am skip reason: subject contains skip directive

Change-Id: Iebf486f51a6614dacb61680759ccd21111babbe5
2020-04-11 00:39:49 +00:00
TreeHugger Robot
8dcd33f953 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f95f9c9392 -s ours
am skip reason: subject contains skip directive

Change-Id: If9b7e8ccca82c08b4ccbeeddf23e2aaad3ef5e3e
2020-04-11 00:17:44 +00:00
TreeHugger Robot
f95f9c9392 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-10 23:57:05 +00:00
TreeHugger Robot
5001991c6b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a4225ef524 -s ours am: 0138966c50 -s ours
am skip reason: subject contains skip directive

Change-Id: I1a3dde6b4732fb0309071baa74fc7c9d9f422497
2020-04-10 22:58:33 +00:00
Joshua Duong
54e8499431 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 am: 7a0fbe20c2 am: eb0e0a2390
Change-Id: Ibe8e8dde2feb86a568f8521083fd653ab19e3652
2020-04-10 22:58:24 +00:00
TreeHugger Robot
0138966c50 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a4225ef524 -s ours
am skip reason: subject contains skip directive

Change-Id: Iade0302348bad1937b74bfec11202e38579f3705
2020-04-10 22:47:10 +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
eb0e0a2390 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 am: 7a0fbe20c2
Change-Id: If95e0d95bb86378106fe25fe46d6955f0a3fe2e8
2020-04-10 22:31:26 +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
d2f1123b58 Fix padding on DND settings header am: 32f2839703 am: 504f43c8fb am: 5cbf1d280f
Change-Id: Ic29832b9344a1555ac90b017c20780d676f84d42
2020-04-10 20:26:56 +00:00
Beverly
5cbf1d280f Fix padding on DND settings header am: 32f2839703 am: 504f43c8fb
Change-Id: I9a7019c4ac01e22ccfca41aae6e71717d3dbbe2c
2020-04-10 20:06:13 +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
TreeHugger Robot
ce877d051b Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe am: 02a8dc0f65
Change-Id: I949e560c7286320e5d2137dacd48a6055db480f7
2020-04-10 13:45:48 +00:00
Bonian Chen
278e5686b2 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a am: 9afe77d369
Change-Id: If75fea0d78b51393ab6fbaa478b43a7e19a565a9
2020-04-10 13:45:32 +00:00
TreeHugger Robot
02a8dc0f65 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe
Change-Id: I3aea9ae40a75266e29d0daa92646c7fd378d7f6c
2020-04-10 13:20:56 +00:00
Bonian Chen
9afe77d369 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a
Change-Id: I73216639deeb8336aae9515693ea738f1a6278d6
2020-04-10 13:20:30 +00:00
TreeHugger Robot
976b3690fe Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77
Change-Id: I0cb34fead8cbcabf7eb01bd058f9604b5c7d19d0
2020-04-10 13:06:21 +00:00
TreeHugger Robot
afaf654a77 Merge "Support click metrics logs in several pages" into rvc-dev 2020-04-10 12:55:10 +00:00
Bonian Chen
b72aa1c03a Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab
Change-Id: Iadc2fa5c7e9ab9b15bf3105c303110c4c2c6d99b
2020-04-10 12:55:01 +00:00
Bonian Chen
bf8634d08a Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796 am: f407842d32
Change-Id: I06401f6158ea3c02bcbb3f832216124f6e20ff50
2020-04-10 12:42:27 +00:00
Bonian Chen
e18904daab Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev 2020-04-10 12:37:42 +00:00
Bonian Chen
f407842d32 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796
Change-Id: Idebedd7bb1ba4823b658aa0bc49413d014bb8c29
2020-04-10 12:14:25 +00:00