Commit Graph

64090 Commits

Author SHA1 Message Date
TreeHugger Robot
19871e51a6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours am: 86c47713b0 -s ours
am skip reason: subject contains skip directive

Change-Id: I3cae3ebfc7e5c001461adf7284514a0d6429e97e
2020-04-14 17:32:57 +00:00
TreeHugger Robot
bf6c4f7030 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours am: 0f16c8c93d -s ours
am skip reason: subject contains skip directive

Change-Id: I15763446adcc120a5017bddf05a4c966325cb0ec
2020-04-14 17:32:12 +00:00
TreeHugger Robot
86c47713b0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ied85b54fa14da4bf75f5fab830874730c4137b75
2020-04-14 17:12:31 +00:00
TreeHugger Robot
0f16c8c93d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours
am skip reason: subject contains skip directive

Change-Id: Id6a385bc0e0e8a3f5cd2c2d2e4b39e6b4003a9ec
2020-04-14 17:12:19 +00:00
TreeHugger Robot
8d9b3172c8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours
am skip reason: subject contains skip directive

Change-Id: Id4cd0d448e621bde289b264d403e1d7ca3e80077
2020-04-14 16:49:06 +00:00
TreeHugger Robot
55e3f34b5e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours
am skip reason: subject contains skip directive

Change-Id: Ida2c0804943b4be8a6409e9a93c8ededafa11c8d
2020-04-14 16:48:39 +00:00
TreeHugger Robot
60fd3c13ad Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-14 16:34:14 +00:00
TreeHugger Robot
6e84c65d49 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-14 16:26:21 +00:00
Julia Reynolds
0acfb1cfb4 Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1 am: d097110f43 am: 9f33509a9e
Change-Id: I4274b8eb43ebb008e894f7a696c05cf07d7c6610
2020-04-14 12:16:07 +00:00
Julia Reynolds
9f33509a9e Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1 am: d097110f43
Change-Id: I25ff937aa2bb0b84f1b434564604b9776142604f
2020-04-14 12:05:23 +00:00
Julia Reynolds
cd1477ad07 Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: 93bc19e3a0 am: 00d5412626
Change-Id: I9e06d549cc4389dc6f386afeaa510e868eef9f05
2020-04-14 12:05:11 +00:00
Julia Reynolds
228048065f Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1 am: e81fdf8011
Change-Id: I509b71439ceac9aa706b64f505349180e112d2fc
2020-04-14 11:56:29 +00:00
Julia Reynolds
00d5412626 Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: 93bc19e3a0
Change-Id: I191b2f6f305094d37bd517e74426c01fd2d41d2c
2020-04-14 11:48:52 +00:00
Julia Reynolds
d097110f43 Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1
Change-Id: I5e4119eadf4f547960f5ea3e6c723e965ed3dbd9
2020-04-14 11:48:49 +00:00
Julia Reynolds
e81fdf8011 Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1
Change-Id: I87aca0b51d821cdd60ff76c1150367e00da4f098
2020-04-14 11:47:15 +00:00
Julia Reynolds
93bc19e3a0 Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439
Change-Id: I29cc292f1ef405952739825e91d5db88ac1de3a7
2020-04-14 11:28:37 +00:00
Julia Reynolds
cc3d0501f1 Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439
Change-Id: Iba88f4b35fa402e95f86b04e42e2e9dea43e48a3
2020-04-14 11:27:42 +00:00
Julia Reynolds
6585f79439 Merge "Bubble settings: feature, notification, app" into rvc-dev 2020-04-14 11:22:14 +00:00
Betty Chang
65be228145 Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a am: b52ee87505 am: 6a16d6ab89 am: b4893ac720
Change-Id: Ia23cdb024765653875e79c7ca0458198887f3f21
2020-04-14 10:58:03 +00:00
Betty Chang
d66d4b340a Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a am: 52466a768d am: 1f446d9a23
Change-Id: I278c4a05a6ef5b94fa54456326c71afdbbe97b71
2020-04-14 10:33:50 +00:00
Betty Chang
d5418fbc39 Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a am: b52ee87505 am: f7b1c11256
Change-Id: Ibed61788261d02253a06013addf9bd3ac18997b3
2020-04-14 10:33:02 +00:00
Betty Chang
b4893ac720 Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a am: b52ee87505 am: 6a16d6ab89
Change-Id: I132b5a72047614a441ee5bc8840751d31090e8b3
2020-04-14 10:32:59 +00:00
Betty Chang
6a16d6ab89 Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a am: b52ee87505
Change-Id: Idf505e7524ebed65db791007bbb54d127e0dc1a2
2020-04-14 10:06:54 +00:00
Betty Chang
1f446d9a23 Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a am: 52466a768d
Change-Id: I1e1b9ef611e81ed761af548d2c74ef4cd0265f34
2020-04-14 10:06:06 +00:00
Betty Chang
f7b1c11256 Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a am: b52ee87505
Change-Id: Ia60cb69646d6898cfedd7ad924f85018f1f7337f
2020-04-14 10:04:37 +00:00
TreeHugger Robot
e7a3142822 Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157 am: 98db0709e7 am: af1792cedb am: 2a0d32ec51
Change-Id: I4cc7f51086f8d2d0fb100fc3e6c0aabe9ca8d4bf
2020-04-14 09:56:56 +00:00
TreeHugger Robot
200d0472dd Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157 am: 4a02711270 am: 306213baa5
Change-Id: I8c89d00c6a8e48368271c8e67a0371ebd83f13c4
2020-04-14 09:45:30 +00:00
Betty Chang
52466a768d Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a
Change-Id: Ie6b7b2b37109e0f287990168f5dc2ed5476567e8
2020-04-14 09:45:23 +00:00
Betty Chang
b52ee87505 Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a
Change-Id: Iea8bac5db7e85949523f17e344ff4ff5708181ab
2020-04-14 09:44:49 +00:00
TreeHugger Robot
165f74b439 Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157 am: 98db0709e7 am: 323b51e879
Change-Id: I742083b3d70966a8794c6af7dd249709d168da04
2020-04-14 09:44:36 +00:00
TreeHugger Robot
2a0d32ec51 Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157 am: 98db0709e7 am: af1792cedb
Change-Id: I49d405c53f7fb3a2c75407862ce0637f03468562
2020-04-14 09:43:32 +00:00
Betty Chang
86551e4d9a Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev 2020-04-14 09:22:04 +00:00
TreeHugger Robot
306213baa5 Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157 am: 4a02711270
Change-Id: Icdad6ce3fb0967c0276b9cb060a27270a888a133
2020-04-14 09:20:58 +00:00
TreeHugger Robot
af1792cedb Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157 am: 98db0709e7
Change-Id: I7711827cc646dc7bc0b48eca4fbee9cda1123985
2020-04-14 09:19:50 +00:00
TreeHugger Robot
323b51e879 Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157 am: 98db0709e7
Change-Id: I9aba4488661208189a9dd5b3d36ac57ca9fff2d7
2020-04-14 09:18:19 +00:00
TreeHugger Robot
44adac5dfe [automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc am: 34fa84add8 am: 7c555fc4c3 am: b509c93eb9 -s ours
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931 is in history

Change-Id: If1e3813d6525a6417a194079b57dd7d56218ba5c
2020-04-14 09:10:57 +00:00
TreeHugger Robot
4a02711270 Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157
Change-Id: I2cbf4713735ed16dc2ecfdbca4f89feede56681e
2020-04-14 09:02:11 +00:00
TreeHugger Robot
98db0709e7 Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157
Change-Id: I8f6dd540054f587a289800755c4cb51ec3673017
2020-04-14 09:00:25 +00:00
TreeHugger Robot
78cb42e359 [automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc -s ours am: 2e2693f6dc -s ours am: eab00379c2 -s ours
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931 is in history

Change-Id: Ib138216ee70e18e9fba5fa63ecc58a603d0ff8dd
2020-04-14 08:50:11 +00:00
TreeHugger Robot
b509c93eb9 Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc am: 34fa84add8 am: 7c555fc4c3
Change-Id: I408c824767546644234206af56115106e44e7dee
2020-04-14 08:49:46 +00:00
TreeHugger Robot
a7ce10082c [automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc am: 34fa84add8 -s ours am: 281e2158bd -s ours
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931 is in history

Change-Id: Ic6cf4b71470c2ef74792f340d3c8406e529bc883
2020-04-14 08:49:42 +00:00
TreeHugger Robot
78ad874157 Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev 2020-04-14 08:39:57 +00:00
TreeHugger Robot
7c555fc4c3 Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc am: 34fa84add8
Change-Id: I4cf9cbb6401cc294a7e26017b6a178bf3cc16d5f
2020-04-14 08:31:03 +00:00
TreeHugger Robot
eab00379c2 [automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc -s ours am: 2e2693f6dc -s ours
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931 is in history

Change-Id: I139ec7e64d2037279dde5ee72d5cb62cce6d67c5
2020-04-14 08:30:59 +00:00
TreeHugger Robot
281e2158bd [automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc am: 34fa84add8 -s ours
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931 is in history

Change-Id: Icb4cd1f5d5aae3316492f6e01e5bc47b63fb2cde
2020-04-14 08:29:39 +00:00
TreeHugger Robot
2e2693f6dc [automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc -s ours
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931 is in history

Change-Id: Ie1a39f1a64db80572937c7454f3975e6684411c6
2020-04-14 08:07:46 +00:00
TreeHugger Robot
34fa84add8 Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc
Change-Id: I323cc1221d8182de32dba59ae57b476d82726e3c
2020-04-14 08:06:28 +00:00
TreeHugger Robot
09600dd8cc Merge "Merge lastest test case from master" into rvc-dev 2020-04-14 07:32:21 +00:00
TreeHugger Robot
f1f7a9ca8b Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: edd104d2da am: 1285d456b9 am: 89d4e74177
Change-Id: Iaea1732b9f245732e716cf2f5f4120bf538cb074
2020-04-14 06:21:21 +00:00
Raff Tsai
7baddeebeb Merge lastest test case from master
Bug: 152716522
Test: atest com.android.settings.tests.perf
Change-Id: If5913440b4a4b58662c195e8cb637804fd6f2449
Merged-In: Ia504dd1185de1d33a21fec344871d4b0fabae953
2020-04-14 06:06:28 +00:00