TreeHugger Robot
f9d0a44959
Merge "Add the package of android into whitelist"
2019-09-18 02:37:07 +00:00
TreeHugger Robot
23d8fe6a7b
Merge "Only add divider in recyclerView once"
2019-09-18 02:28:39 +00:00
Neil Fuller
64eccbf9af
Merge "Remove use of deprecated Time class" am: b3f8696c4d am: b83ddefb5c am: 42b55bc6f6
...
am: ac3d9d8641
Change-Id: I71bc0a1411abc6433016554e073da5868df3b952
2019-09-17 10:24:31 -07:00
Neil Fuller
ac3d9d8641
Merge "Remove use of deprecated Time class" am: b3f8696c4d am: b83ddefb5c
...
am: 42b55bc6f6
Change-Id: I69ea913c7596017ab2d08dfe67c8376527d01603
2019-09-17 10:17:41 -07:00
Neil Fuller
42b55bc6f6
Merge "Remove use of deprecated Time class" am: b3f8696c4d
...
am: b83ddefb5c
Change-Id: Iafc1b00c254a5f7cc6af80b3eeeaf4418fbdbaf9
2019-09-17 10:06:03 -07:00
Neil Fuller
b83ddefb5c
Merge "Remove use of deprecated Time class"
...
am: b3f8696c4d
Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
2019-09-17 09:56:45 -07:00
Treehugger Robot
b3f8696c4d
Merge "Remove use of deprecated Time class"
2019-09-17 16:32:47 +00:00
Sunny Shao
400b4401aa
Add the package of android into whitelist
...
Add the package name android into config_reset_app_package_name
array list. To avoid running clear data on package android.
Fixes: 140520685
Test: manual test
Change-Id: I53dd0e7cf8060ae4455d05125fd3afd3acbeae13
2019-09-17 14:38:01 +00:00
Neil Fuller
4c77d00e34
Remove use of deprecated Time class
...
Remove a use of the deprecated Time class.
Bug: 16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
2019-09-17 13:53:17 +01:00
TreeHugger Robot
a9177ca0eb
Merge "Replace png file with vector drawable"
2019-09-17 09:11:56 +00:00
Mady Mellor
01a7d9ffac
[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev am: eac42583a1 -s ours
...
am: 82c74accb0 -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1 0c47113a5b is in history
Change-Id: I21d24bebf7ddd951a4caced854e9b7087b82850f
2019-09-16 15:34:34 -07:00
Mady Mellor
f661124c63
[automerger skipped] qt-r1-bubbles-dev @ build 5835883 am: 91ba8e9b66 -s ours
...
am: 94e2682ad1 -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1 0c47113a5b is in history
Change-Id: I69891547c7cbc131affa75c4dff4e27ae4b094a4
2019-09-16 15:26:54 -07:00
Mady Mellor
82c74accb0
[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev
...
am: eac42583a1 -s ours
am skip reason: change_id I58f0287ed99a4daf3758316e4004bca05f17b0d1 with SHA1 ea79e343f0 is in history
Change-Id: I80f853b777590b66aa8689e36864b381a947cb72
2019-09-16 15:22:08 -07:00
Mady Mellor
94e2682ad1
[automerger skipped] qt-r1-bubbles-dev @ build 5835883
...
am: 91ba8e9b66 -s ours
am skip reason: change_id I58f0287ed99a4daf3758316e4004bca05f17b0d1 with SHA1 ea79e343f0 is in history
Change-Id: I4bcd05a7b87d9735c545a4599fffefc82e0c4856
2019-09-16 15:16:35 -07:00
Mady Mellor
eac42583a1
Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev
2019-09-16 21:55:52 +00:00
Tsung-Mao Fang
b455d58c03
Only add divider in recyclerView once
...
Only add divider in recyclerView once or more and more dividers
will be set in recyclerView.
Change-Id: I765ed888d460be221341dafe3521a849b8dd3889
Fix: 139452947
Test: Show panel many times and see the divider.
2019-09-16 15:31:42 +08:00
Raff Tsai
e80f67b94b
Replace png file with vector drawable
...
Fixes: 139336138
Test: visual
Change-Id: I6fa504d406e4b9b37b8260ec9fb92f265e4a45da
2019-09-16 11:41:37 +08:00
Bill Yi
68b772bb8d
[automerger skipped] Import translations. DO NOT MERGE am: 1ae748b09f -s ours
...
am: e3f5ddcdfe -s ours
am skip reason: subject contains skip directive
Change-Id: Ieecf808857f0d95c4db6cd701e581d9c93baf22c
2019-09-15 15:34:56 -07:00
Bill Yi
e3f5ddcdfe
[automerger skipped] Import translations. DO NOT MERGE
...
am: 1ae748b09f -s ours
am skip reason: subject contains skip directive
Change-Id: Ibb1bf53b21569e91e4d9e1ce47577fa525aaaec0
2019-09-15 15:28:41 -07:00
Bill Yi
1ae748b09f
Import translations. DO NOT MERGE
...
Change-Id: If6b8f670eb54a3f5b45efa0ba2a540cd25327260
Auto-generated-cl: translation import
2019-09-14 18:38:18 -07:00
Ilya Matyukhin
51ac1a881e
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev am: 3df43a3eae
...
am: 4dfe356797
Change-Id: Id0fe0d8c491a76bed3108c59acf3bb7d7179101c
2019-09-13 02:34:52 -07:00
Ilya Matyukhin
4dfe356797
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
...
am: 3df43a3eae
Change-Id: Iaeaedcde2e27f07cb5849a2cf670219fd143b934
2019-09-13 02:28:52 -07:00
Ilya Matyukhin
3df43a3eae
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
2019-09-13 09:10:32 +00:00
Ilya Matyukhin
a95459c640
Fix "skip lock screen" not working for a secondary user
...
Bug: 140878309
Test: "Skip lock screen" is no longer grayed-out for a secondary user
Change-Id: I3aab6582bee07760b671034b0971c98b1c946a1c
2019-09-13 09:10:15 +00:00
Bill Yi
ea1af11a80
[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours am: 5c90432dc1 -s ours
...
am: eeca546428 -s ours
am skip reason: subject contains skip directive
Change-Id: Id1d0ad08693f87b8433bb6707b10a10f976442ab
2019-09-12 17:54:51 -07:00
Bill Yi
308e8da240
[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours am: edbddf7f42 -s ours
...
am: 3590e5d52c -s ours
am skip reason: subject contains skip directive
Change-Id: Id179916589bdb32c328b42136a4a9004a8da46ca
2019-09-12 17:50:21 -07:00
Bill Yi
eeca546428
[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours
...
am: 5c90432dc1 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic722d4de71c99e005a84f5650c8bf9c82c392cd0
2019-09-12 17:49:20 -07:00
Bill Yi
3590e5d52c
[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours
...
am: edbddf7f42 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib0eeb1f2ac5bff404717b4550d48c32bc536ef61
2019-09-12 17:42:18 -07:00
Bill Yi
5c90432dc1
[automerger skipped] Import translations. DO NOT MERGE
...
am: 86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: I9979a3422b5926a7e210ded393484f6eb28e8600
2019-09-12 17:39:37 -07:00
Bill Yi
26378717af
[automerger skipped] Import translations. DO NOT MERGE am: f066797849 -s ours
...
am: 6ada8629a2 -s ours
am skip reason: subject contains skip directive
Change-Id: I4d460c8fd412c59964455dbf7190dfa2c0a9995f
2019-09-12 17:35:35 -07:00
Bill Yi
6ada8629a2
[automerger skipped] Import translations. DO NOT MERGE
...
am: f066797849 -s ours
am skip reason: subject contains skip directive
Change-Id: I83269163f1e1f3752a85cb4eaed860316efba142
2019-09-12 17:28:34 -07:00
Bill Yi
edbddf7f42
[automerger skipped] Import translations. DO NOT MERGE
...
am: 86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib139ea535e149923d50d835e030636df7edbf7cc
2019-09-12 17:28:33 -07:00
Bill Yi
f066797849
Import translations. DO NOT MERGE
...
Change-Id: I27cfc6c9ffa9def49d83eea920b88a5ce762fb53
Auto-generated-cl: translation import
2019-09-12 16:10:45 -07:00
Bill Yi
86dfbd6254
Import translations. DO NOT MERGE
...
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
2019-09-12 15:54:53 -07:00
cosmohsieh
82af911193
[automerger skipped] Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev am: 17cbea0112
...
am: 7aee812888 -s ours
am skip reason: change_id I4b06c9772598ab3f9416f32456cd0a65e2d70d68 with SHA1 0f2773fb78 is in history
Change-Id: I1a7f5d4f59880bf675f8971082174fb336d268eb
2019-09-12 14:21:32 -07:00
cosmohsieh
7aee812888
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
...
am: 17cbea0112
Change-Id: Icc3c00f542746c1ffa423c04c160ba85e53ad834
2019-09-12 14:09:30 -07:00
TreeHugger Robot
17cbea0112
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
2019-09-12 20:49:56 +00:00
TreeHugger Robot
af1cd790bf
Merge "Merge similar BaseSearchIndexProvider code together"
2019-09-12 11:22:40 +00:00
TreeHugger Robot
5479ffdbaa
Merge "Replace png file with vector drawable"
2019-09-12 10:05:01 +00:00
Arc Wang
ce024a0dc5
[automerger skipped] Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev am: ec3055b9eb
...
am: 40f22313dc -s ours
am skip reason: change_id Iddc1dae53849760f43b41b75262358dff6ba09af with SHA1 9db4bf7dbb is in history
Change-Id: Ieb15ac82f64bb17a8a3bfcf0dfa31cb7640bfc86
2019-09-12 01:21:54 -07:00
Arc Wang
40f22313dc
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
...
am: ec3055b9eb
Change-Id: I89755845ae509051e4fc2fcfb8f1dd1ee5ab195c
2019-09-12 01:14:57 -07:00
TreeHugger Robot
ec3055b9eb
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
2019-09-12 08:05:21 +00:00
Raff Tsai
002a488354
Replace png file with vector drawable
...
Bug: 139336138
Test: visual
Change-Id: I2c97accbb7a4e693f50d23ee340cbc5c09101747
2019-09-12 15:24:43 +08:00
Bill Yi
481b51e7f3
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: 9b956eb47f -s ours
...
am: a5c810d4a2 -s ours
am skip reason: subject contains skip directive
Change-Id: I636c33ea04b552a66024e99e1fa337f4808628d7
2019-09-11 23:04:52 -07:00
Bill Yi
9f72af23d1
[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: e6107df474 -s ours
...
am: c46430c80e -s ours
am skip reason: subject contains skip directive
Change-Id: I93cd460214154bb1443bf1a37499eff0ece851c8
2019-09-11 23:04:21 -07:00
Bill Yi
fc9b310060
[automerger skipped] Import translations. DO NOT MERGE am: deee385ba8 -s ours
...
am: 525b411585 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib2951aec554167b13c9c5000dae4dbbdd2975587
2019-09-11 23:03:33 -07:00
Android Build Merger (Role)
a5c810d4a2
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: 9b956eb47f -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-09-12 05:57:41 +00:00
Bill Yi
938427d5f5
[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours
...
am: 9b956eb47f -s ours
am skip reason: subject contains skip directive
Change-Id: I56786fa936a90e1870aa8b49ccd3eb1e4e1c2de3
2019-09-11 22:57:29 -07:00
Bill Yi
c46430c80e
[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours
...
am: e6107df474 -s ours
am skip reason: subject contains skip directive
Change-Id: I3fe8c6432c4b840365aeebdbf2c455a4e98bd514
2019-09-11 22:57:28 -07:00
Bill Yi
525b411585
[automerger skipped] Import translations. DO NOT MERGE
...
am: deee385ba8 -s ours
am skip reason: subject contains skip directive
Change-Id: I270de5daddcee5c1ed3c779bcad217dd1526cbe8
2019-09-11 22:54:54 -07:00