Commit Graph

55271 Commits

Author SHA1 Message Date
joshmccloskey
7abb800c9f Updated face remove dialog string.
Test: Verified that the correct string shows after deleting
face data.
Fixes: 141145591

Change-Id: I836c79fb4775157ae4995f706e05d1fd1233bc8f
2019-09-17 23:46:46 +00: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
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
android-build-team Robot
5addc20224 Snap for 5879506 from eac42583a1 to qt-qpr1-release
Change-Id: Iddf8a125f731bb3e14240efa3f294034738e8d2a
2019-09-17 03:02:21 +00: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
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
android-build-team Robot
28d3df1117 Snap for 5876498 from 3df43a3eae to qt-qpr1-release
Change-Id: I5be8312de9e3e7c3ef26fa72d534b5b9801f7cfc
2019-09-14 23:01:32 +00: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
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
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
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
paulhu
52d24750a4 [Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED
Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.

Bug: 32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4
2019-09-12 17:21:43 +08: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
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
Bill Yi
e6107df474 [automerger skipped] Import translations. DO NOT MERGE
am: 8173de150d -s ours
am skip reason: subject contains skip directive

Change-Id: I010ba47035a6530ec5d50abd363a6ea013515551
2019-09-11 22:50:29 -07:00
Bill Yi
9b956eb47f [automerger skipped] Import translations. DO NOT MERGE
am: 8173de150d -s ours
am skip reason: subject contains skip directive

Change-Id: Ica53f59adc22c9442b6c823abc35a63c2e864d8e
2019-09-11 22:50:27 -07:00
android-build-team Robot
935ea893ab Snap for 5869577 from 8191079b21 to qt-qpr1-release
Change-Id: Ic86684d380a06e5ef7412e77d2040a809d41eb5a
2019-09-12 03:24:03 +00:00
Bill Yi
deee385ba8 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1b2826dd790519a2946d8505aec03f72b1815f04
2019-09-11 19:26:07 -07:00
Bill Yi
8173de150d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
2019-09-11 19:10:50 -07:00
Mady Mellor
91ba8e9b66 qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 129158983
Bug: 136034310
Bug: 137876221

Change-Id: I5ade70c2101d09eed4698ce29bd3242483ec7f8b
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
Merged-In: I58f0287ed99a4daf3758316e4004bca05f17b0d1
2019-09-11 22:42:17 +00:00
Mady Mellor
88de4328fd Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp 2019-09-11 22:40:20 +00:00
Xin Li
fe99707541 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: aac7f8e2cd -s ours
am: 827172cee1 -s ours
am skip reason: change_id Idcc078c0e541c04633db6d94c613ac4c861ba963 with SHA1 7195e05dfa is in history

Change-Id: I717bb9c937ab8d3eaf4f5809efa874357f482a2e
2019-09-11 14:57:08 -07:00
Xin Li
827172cee1 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: aac7f8e2cd -s ours
am skip reason: change_id Idcc078c0e541c04633db6d94c613ac4c861ba963 with SHA1 7195e05dfa is in history

Change-Id: I7826eee6fd99a83bf4e8a96bb51f0622fbdf84c3
2019-09-11 14:09:27 -07:00
Android Build Merger (Role)
f931d88a0b Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours am: 8191079b21 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-09-11 19:10:12 +00:00
Bill Yi
1cd4a7040e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours
am: 8191079b21 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie08d32473345828c033f4ccd3d8373bc4d6466f3
2019-09-11 12:10:01 -07:00
Bill Yi
7303be2997 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours
am: 73a98df64b -s ours
am skip reason: subject contains skip directive

Change-Id: Ia3e5d45060f2c56472321a7d219587ce42ac15e9
2019-09-11 12:09:59 -07:00
Bill Yi
73a98df64b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 09c08d1da0 -s ours
am skip reason: subject contains skip directive

Change-Id: I8a743a33b14e424069a75ac9d590ffca287300f1
2019-09-11 12:03:01 -07:00
Bill Yi
8191079b21 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 09c08d1da0 -s ours
am skip reason: subject contains skip directive

Change-Id: I07fe60817626b45ba59b9e0f823aa7f462533b19
2019-09-11 12:03:00 -07:00
TreeHugger Robot
09c08d1da0 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-09-11 18:41:53 +00:00
Bill Yi
23269a9dce [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 914bda7715 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6cf99a4b968e4983e5562741349e9cce58d806b
2019-09-11 11:35:13 -07:00
TreeHugger Robot
914bda7715 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-09-11 18:18:32 +00:00
Bill Yi
cbfbd39821 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1ee6e4e49b18ed13ab3e431583d316c0663a4f8f
2019-09-10 22:37:57 -07:00