Commit Graph

64227 Commits

Author SHA1 Message Date
TreeHugger Robot
d2b330f5ef Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3
Change-Id: Ie00b07ebe6e474e5371bf12ed851e91be116a4a6
2020-04-13 01:11:27 +00:00
TreeHugger Robot
0b653fe083 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872
Change-Id: Ibd5efd60fdd6c4678d95b3e41e9bd0c4e45330ac
2020-04-13 00:49:42 +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
Bonian Chen
6ae8610b2a [automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours am: 9e0dea0c05 -s ours am: 3390caf31d -s ours
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history

Change-Id: If2d670f4c83b3b77c0dcf07211b3914b5a2283ea
2020-04-12 18:59:24 +00:00
Bonian Chen
3390caf31d [automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours am: 9e0dea0c05 -s ours
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history

Change-Id: Ib2d4f7e0c285430e1616217cf745c557e09240bc
2020-04-12 18:40:25 +00:00
Bonian Chen
9e0dea0c05 [automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history

Change-Id: I7d0f1d8d93b4dfee1ef8e7a6b42b967d55192f0e
2020-04-12 18:24:46 +00:00
Bonian Chen
74e3771df3 Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96
Change-Id: I898b16508649f6f0f11002a810089b4d9c133a4e
2020-04-12 18:02:49 +00:00
Bonian Chen
d43db12f96 Merge "[Settings] Avoid from crash when pull out SIM" 2020-04-12 17:42:45 +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
TreeHugger Robot
c251150bb7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours am: e7c0cff6a0 -s ours am: 11ab1464c4 -s ours
am skip reason: subject contains skip directive

Change-Id: I852e696ab68d907df3dd7aab2a6231c4974d384f
2020-04-11 23:37:37 +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
8fc8a2e133 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours am: 458ffc97a0 -s ours
am skip reason: subject contains skip directive

Change-Id: I1bf323ee2cb547228e230160e1b388e6c1f0832a
2020-04-11 23:17:44 +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
458ffc97a0 [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: Iad746f8a6a22da774183acdf8ba1da062902a6fd
2020-04-11 22:58:58 +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
1cde54c4de [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours am: e19e364142 -s ours am: 0a7e821da3 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b3fb257f6eaff0de75794ce273d51a67a3fdc9c
2020-04-11 22:30:52 +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
0442a93442 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours am: 48acb04b48 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5fe8db3ca8ad3f085b652b2a572ef61d2e2f81d
2020-04-11 22:05:16 +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
48acb04b48 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae3f57dabdb95a4301dbff8514e240709f50e027
2020-04-11 01:00:16 +00: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
71fc35352d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f95f9c9392 -s ours am: 31888713b5 -s ours
am skip reason: subject contains skip directive

Change-Id: I3464c92fd0c1d66b4c925a4365d93c1db1c26f2e
2020-04-11 00:39:48 +00:00
TreeHugger Robot
31888713b5 [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: I7c45466a049b54586b1d5f9336b51c74c257f862
2020-04-11 00:17:57 +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
88b93498dc [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a4225ef524 -s ours am: 0138966c50 -s ours am: 5001991c6b -s ours
am skip reason: subject contains skip directive

Change-Id: I3f95c065117c999fdb8270ba9cf7c816096eadf2
2020-04-10 23:20:20 +00:00
Joshua Duong
ceed41ce24 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 am: 7a0fbe20c2 am: eb0e0a2390 am: 54e8499431
Change-Id: Icdeb003a4fec0f5d2b179120d015c03cbf3176dd
2020-04-10 23:20:12 +00:00
TreeHugger Robot
16d8ec3d1c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a4225ef524 -s ours am: c613c6cd58 -s ours
am skip reason: subject contains skip directive

Change-Id: I478edc6cee97d54b909e40e50a02af8f39147487
2020-04-10 22:59:01 +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
Joshua Duong
800b271c78 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 am: 7a0fbe20c2 am: 49cfa5db8e
Change-Id: I1c75aa30ae54e61fcf5f5738c006f42baa11a5de
2020-04-10 22:58:22 +00:00
Joshua Duong
9f5f510c23 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 am: 2ae802aa4a am: 5cd4b55df6
Change-Id: I906942807f51d0019194cd769ac6714851dfc148
2020-04-10 22:57:08 +00:00
TreeHugger Robot
c613c6cd58 [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: I003a3ec11f7ff566d7cc9ed057e2875b3b5f94c4
2020-04-10 22:47:11 +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
49cfa5db8e Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 am: 7a0fbe20c2
Change-Id: I971480f5131231d0be34b2ed9d095712ac8bdabf
2020-04-10 22:31:40 +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
5cd4b55df6 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 am: 2ae802aa4a
Change-Id: I3ab38093b30fa3cea522de86efba548cd83c70f5
2020-04-10 22:31:17 +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
Beverly
3f58db1b04 Fix padding on DND settings header am: 32f2839703 am: 504f43c8fb am: 5cbf1d280f am: d2f1123b58
Change-Id: Idf129a0c2d5901c85f4d66e0d9fd8c4e3af7f843
2020-04-10 20:46:09 +00: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
Automerger Merge Worker
8687d45f35 Merge "Fix padding on DND settings header am: 32f2839703 am: 1e640f4608" into rvc-d1-dev-plus-aosp am: 20bfa5707a
Change-Id: Id265b731f88fa92046bc8e2117a5ec7b23f5d85a
2020-04-10 20:25:48 +00:00