TreeHugger Robot
3d94e341ea
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours am: 57f73fff09 -s ours am: 98d19cb1d5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I00c4114e6b0ad7eb5acd97fad650fdfd4d134e97
2020-05-15 23:12:31 +00:00
TreeHugger Robot
069874f09b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours am: 3845234a31 -s ours am: d9423bb281 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If29fb47b56fb3f4437e86b9efd519f90ca96a5cd
2020-05-15 23:12:11 +00:00
TreeHugger Robot
d11650eaf9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours am: 7b104cf937 -s ours am: 967c0ca449 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ica68e4dd62bbf8486b11fc36071c7f2eba7d51b2
2020-05-15 23:11:38 +00:00
TreeHugger Robot
ac8072ff3b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours am: ae2531ed5d -s ours am: b7b4996258 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ied08ca481d079d5b2d3bfed2e76dc0ddf1da112a
2020-05-15 23:06:01 +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
Automerger Merge Worker
08e2248f48
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: d0a105b3f2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie5ee87dbed89c1dba3dbccce9b4427b3efdcf729
2020-05-15 22:35:03 +00:00
TreeHugger Robot
798125df0e
[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: d53c21e60e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I83790cb194d4d50f2a810404adb8913e166e1e43
2020-05-15 22:34:42 +00:00
Bill Yi
c98f31200e
[automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: f9f0ee1539 -s ours am: 7968c73b5b -s ours am: 32c2cad56e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2376f3aaed45e4f9853feb0623862b43557b0e0b
2020-05-15 22:33:51 +00:00
TreeHugger Robot
433fcc134e
[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: 95d020b526 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iaa0f113c8837201b7296d8255c4e655f4e9a82f4
2020-05-15 22:33:02 +00:00
Bill Yi
4ddab2067e
[automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours am: c1567ea37b -s ours am: 6688699058 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia81f1733b77d058bb469db1c9b2f7d6ba96a077a
2020-05-15 22:32:08 +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
Bill Yi
bda51c20a3
[automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours am: 90b6c14fd6 -s ours am: 88ab100293 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2dfc1472cc8a40f7c42381618aa1a2c45216fb05
2020-05-15 22:31:13 +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
TreeHugger Robot
76215df1df
Merge "[Wi-Fi] Quit worker thread in WifiNetworkListFragment"
2020-05-15 20:11:05 +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
Kweku Adams
eb4786ed70
Migrate to PowerWhitelistManager.
...
In preparation for DeviceIdle mainlining, we have to define stable APIs
for other modules and the rest of the system to use. This migrates to
the stable PowerWhitelistManager API.
Bug: 142420609
Bug: 144864180
Test: Android builds
Change-Id: Ic1006c03f3b73c2855fd127ee2cd7fff676caf3e
2020-05-15 10:42:40 -07:00
Automerger Merge Worker
ec28e4e674
Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp am: dc6d6624ba
...
Change-Id: Ia919586571ea06e7776a0911b520f85f6192aff7
2020-05-15 12:54:32 +00:00
Yanting Yang
f28b7d3bbc
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f am: 360fdd8886
...
Change-Id: I238d957b0980000598efa6a58e0a4f2bb36116a5
2020-05-15 12:54:13 +00:00
Yanting Yang
838957c0f9
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064 am: fa064bf433
...
Change-Id: Ia51c13206f46b78aa7f23a86eb80683cc03d8af2
2020-05-15 12:53:51 +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
