Commit Graph

67440 Commits

Author SHA1 Message Date
TreeHugger Robot
0b0bfd5bf3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: e515101a1c -s ours
am skip reason: subject contains skip directive

Change-Id: Ieadbc12622c84194a8c268db0e6340b94e91c334
2020-05-15 23:33:23 +00:00
TreeHugger Robot
d50f81964a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours
am skip reason: subject contains skip directive

Change-Id: I9ce753c56255ff5761ec97e77383d54e26407dcc
2020-05-15 23:33:16 +00:00
TreeHugger Robot
10ab1e1e8b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours
am skip reason: subject contains skip directive

Change-Id: Ia85b67e00108440d4e5f5cefee08f85daddf23a2
2020-05-15 23:32:53 +00:00
TreeHugger Robot
6051f64b1f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 04ced7e940 -s ours
am skip reason: subject contains skip directive

Change-Id: I020debdc0ae7265ec55d988eef63c9bdb5d4a904
2020-05-15 23:32:50 +00:00
TreeHugger Robot
0736ea6e03 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours
am skip reason: subject contains skip directive

Change-Id: I201eb0bcaf8e23ff57a393b6cebb84447832f714
2020-05-15 23:32:41 +00:00
TreeHugger Robot
2b52ac3be1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1abd856f01b4b465a73cfc38a696f2be11e5327
2020-05-15 23:32:32 +00:00
TreeHugger Robot
e515101a1c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours
am skip reason: subject contains skip directive

Change-Id: I5f46d6eb42d31a8784136077ab22cc654f8345ed
2020-05-15 23:25:56 +00:00
TreeHugger Robot
30738191dc [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibf3b226075a48d1768917f411753ae8f00b3d1f0
2020-05-15 23:25:51 +00:00
TreeHugger Robot
a264157438 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-15 23:21:28 +00:00
TreeHugger Robot
753c885c08 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4c632199a55c066c9ae45b82fe9ed28233c5227
2020-05-15 23:19:37 +00:00
TreeHugger Robot
04ced7e940 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours
am skip reason: subject contains skip directive

Change-Id: I3b869d614495efc34ad2f0348694e4141de49d93
2020-05-15 23:19:29 +00:00
TreeHugger Robot
a9ef11f243 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-15 23:05:04 +00:00
TreeHugger Robot
98d19cb1d5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours am: 57f73fff09 -s ours
am skip reason: subject contains skip directive

Change-Id: I8af547f500e4f3876880f1c06d49cd47cecbdf79
2020-05-15 22:47:01 +00:00
TreeHugger Robot
d9423bb281 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours am: 3845234a31 -s ours
am skip reason: subject contains skip directive

Change-Id: I0ed3b78dbf10b4181ebc6d95d30e194961c76285
2020-05-15 22:43:50 +00:00
TreeHugger Robot
967c0ca449 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours am: 7b104cf937 -s ours
am skip reason: subject contains skip directive

Change-Id: I60d512de3a6ebffdb0547145e6ce5e45f859fdc5
2020-05-15 22:43:44 +00:00
TreeHugger Robot
b7b4996258 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours am: ae2531ed5d -s ours
am skip reason: subject contains skip directive

Change-Id: I6024ea3f05d8c2a9040610d75514499b89c643a3
2020-05-15 22:42:54 +00:00
TreeHugger Robot
57f73fff09 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifa08bec0183dad1408feb27cef740edf3f5a3dd8
2020-05-15 22:31:34 +00:00
TreeHugger Robot
3845234a31 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours
am skip reason: subject contains skip directive

Change-Id: I78cc0de8eb4c709c7bb152be2f98c2967439243c
2020-05-15 22:31:29 +00:00
TreeHugger Robot
ae2531ed5d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours
am skip reason: subject contains skip directive

Change-Id: If4ea389a63795bc514a70a36fea853cedd8a252b
2020-05-15 22:31:26 +00:00
TreeHugger Robot
7b104cf937 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours
am skip reason: subject contains skip directive

Change-Id: I57370de051c5d2fbe051e4c7f2faacea907624b9
2020-05-15 22:30:46 +00:00
TreeHugger Robot
aa76705149 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-15 22:26:30 +00:00
Automerger Merge Worker
d0a105b3f2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 10244a3ce0 -s ours" into rvc-d1-dev-plus-aosp am: e5b64442ca -s ours
am skip reason: subject contains skip directive

Change-Id: I9ff046ec2ab3c9fa22bd08261d491af80ab40274
2020-05-15 22:16:49 +00:00
TreeHugger Robot
d53c21e60e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 489b78cae9 -s ours am: 2bc446c98b -s ours
am skip reason: subject contains skip directive

Change-Id: I9b7385ae0588b4cc38a2cd4f1a1a50dec91ba252
2020-05-15 22:16:35 +00:00
Bill Yi
32c2cad56e [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: f9f0ee1539 -s ours am: 7968c73b5b -s ours
am skip reason: subject contains skip directive

Change-Id: I39d47104edf13f8e699c2f569053da054ad4cdd6
2020-05-15 22:15:55 +00:00
TreeHugger Robot
95d020b526 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 489b78cae9 -s ours am: c51e9b5864 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie2ef832047cf266dd4348c8670038589f61dc8e4
2020-05-15 22:15:30 +00:00
Bill Yi
6688699058 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours am: c1567ea37b -s ours
am skip reason: subject contains skip directive

Change-Id: Id47200ca980ab6b51735f626877e6432fee50e65
2020-05-15 22:14:58 +00:00
TreeHugger Robot
f94e4f739e Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-15 22:14:41 +00:00
Bill Yi
88ab100293 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours am: 90b6c14fd6 -s ours
am skip reason: subject contains skip directive

Change-Id: I71d9d9d568fed5ed5117137a0a282ee0c8d79768
2020-05-15 22:14:31 +00:00
TreeHugger Robot
c51e9b5864 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 489b78cae9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic3115f588e544915f955227e48608d02a4036ee2
2020-05-15 22:05:22 +00:00
Automerger Merge Worker
e5b64442ca Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 10244a3ce0 -s ours" into rvc-d1-dev-plus-aosp 2020-05-15 22:05:08 +00:00
TreeHugger Robot
14a4df4634 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 10244a3ce0 -s ours
am skip reason: subject contains skip directive

Change-Id: I14506440b31334d87e2f029e6e596533a5fd7e75
2020-05-15 22:05:03 +00:00
TreeHugger Robot
2bc446c98b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 489b78cae9 -s ours
am skip reason: subject contains skip directive

Change-Id: I6e9617143d7d85efdd78eba3d3f34e00e1684c06
2020-05-15 22:04:56 +00:00
Bill Yi
7968c73b5b [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: f9f0ee1539 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie479e750719702bf33a60e5bdc000cbaf60092e0
2020-05-15 22:04:01 +00:00
Bill Yi
90b6c14fd6 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours
am skip reason: subject contains skip directive

Change-Id: I85abce567222922e5b4c916ef34a95a207f62463
2020-05-15 22:03:56 +00:00
Bill Yi
c1567ea37b [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours
am skip reason: subject contains skip directive

Change-Id: Iff980ca90e1e8a5ddc1c5a773f74783af38acf0e
2020-05-15 22:03:52 +00:00
TreeHugger Robot
489b78cae9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours
am skip reason: subject contains skip directive

Change-Id: I22a5978bfb41a9ecc027bff2e8986353b7e4b46b
2020-05-15 21:44:19 +00:00
TreeHugger Robot
10244a3ce0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours
am skip reason: subject contains skip directive

Change-Id: I97d476e4022e9b78e43cd5f07a08fd5b7d3bb796
2020-05-15 21:43:52 +00:00
Bill Yi
f9f0ee1539 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours
am skip reason: subject contains skip directive

Change-Id: I1d0b0627353a635801a19c8db5e662bea41f50ef
2020-05-15 21:43:44 +00:00
Bill Yi
9b1b0a9c75 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours
am skip reason: subject contains skip directive

Change-Id: If32dd964132dfe8d0a8bb826a26734fa07909165
2020-05-15 21:43:37 +00:00
TreeHugger Robot
e002abfb6c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours
am skip reason: subject contains skip directive

Change-Id: I95387650d0f829bb6658ad0700c5d3fdff442595
2020-05-15 21:26:30 +00:00
Bill Yi
3a86ceebae [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie3afdfd7a7e11ebcbe5ae7d699a1fbd4ff5fd3e5
2020-05-15 21:26:23 +00:00
TreeHugger Robot
8e7fa0958a Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-05-15 21:13:40 +00:00
Julia Reynolds
f0c3245639 Fix jank on conversation screen
Onboarding should only appear if needed

Test: manual
Fixes: 156756305
Change-Id: I663677772806db9c80979cdac103c9fa657ee7e2
2020-05-15 19:41:12 +00:00
Julia Reynolds
cd237ccf9b Update conversation launch point
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 156670585
Change-Id: I31f306d1b7d480ac0ef0cc4a5f7e66efe528383d
2020-05-15 19:40:56 +00:00
Julia Reynolds
eca1e4d197 Add settings for apps that don't use full conversations
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 155276427
Change-Id: Ie145b9cdc9555d4676a8bd225427abc9222f31c5
2020-05-15 19:38:14 +00:00
Automerger Merge Worker
dc6d6624ba Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp 2020-05-15 12:31:46 +00:00
Yanting Yang
3fee8e0c8f Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88
Change-Id: I17b96ff3b0cb78823bea64d709e41e56c50fe16c
2020-05-15 12:31:41 +00:00
Yanting Yang
360fdd8886 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f
Change-Id: I8bdcb7e50dd65f57870eef048519624bdb49aad5
2020-05-15 12:31:37 +00:00
Yanting Yang
fa064bf433 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064
Change-Id: Ie94785c96d827bd401c5cfc01e420770eed36f60
2020-05-15 12:31:26 +00:00
Yanting Yang
2b8702ad88 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5
Change-Id: If84a87337bb5ecd5d8380111415188cc2a99cd54
2020-05-15 12:14:06 +00:00