Bill Yi
f5e74d30d6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 59e1c0a768
2019-09-22 12:54:00 -07:00
TreeHugger Robot
59e1c0a768
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-22 19:42:36 +00:00
Bill Yi
0b39e54783
Import translations. DO NOT MERGE
...
Change-Id: I92110fede16a12a445efbd96896e17f46f89a203
Auto-generated-cl: translation import
2019-09-22 07:52:20 -07:00
Edgar Wang
18839c1fbc
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
...
am: 07ea1dc815
2019-09-21 02:07:52 -07:00
Edgar Wang
07ea1dc815
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
2019-09-21 08:54:47 +00:00
Edgar Wang
c3a9fff980
Handle Aware sensor status for Always On
...
- "Always On" preference will be hiden when aware
sensor is available
- Extract NavModeCandidateInfo from SystemNavigationGestureSettings
Bug: 136610131
Test: robotest & manual
Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
2019-09-21 02:08:36 +08:00
Bonian Chen
3cce668981
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
...
am: 20290d0451
2019-09-19 13:25:31 -07:00
Bonian Chen
20290d0451
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
2019-09-19 20:07:20 +00:00
Bonian Chen
fad5a00b84
[Help Page] Support help content under 2 CDMA SIM
...
Fix the design for displaying help content.
Launch help content from notification (PendingIntent) could not be resolved correctly.
Route through HelpTrampoline to fix it.
Bug: 139040358
Test: Manual with fake from framework side for dual CDMA SIM
Change-Id: Iff3a6e9095c3908b3c5b1a25e2535bcab1858ae2
2019-09-18 22:20:25 +00:00
joshmccloskey
3b20d776fe
Updated face remove dialog string.
...
am: 7abb800c9f
2019-09-17 20:30:28 -07:00
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
2019-09-17 10:17:41 -07:00
Neil Fuller
42b55bc6f6
Merge "Remove use of deprecated Time class" am: b3f8696c4d
...
am: b83ddefb5c
2019-09-17 10:06:03 -07:00
Neil Fuller
b83ddefb5c
Merge "Remove use of deprecated Time class"
...
am: b3f8696c4d
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
Mady Mellor
82c74accb0
[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev
...
am: eac42583a1ea79e343f0
2019-09-16 15:22:08 -07:00
Mady Mellor
94e2682ad1
[automerger skipped] qt-r1-bubbles-dev @ build 5835883
...
am: 91ba8e9b66ea79e343f0
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
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
4dfe356797
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
...
am: 3df43a3eae
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
2019-09-12 17:49:20 -07:00
Bill Yi
3590e5d52c
[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours
...
am: edbddf7f42
2019-09-12 17:42:18 -07:00
Bill Yi
5c90432dc1
[automerger skipped] Import translations. DO NOT MERGE
...
am: 86dfbd6254
2019-09-12 17:39:37 -07:00
Bill Yi
6ada8629a2
[automerger skipped] Import translations. DO NOT MERGE
...
am: f066797849
2019-09-12 17:28:34 -07:00
Bill Yi
edbddf7f42
[automerger skipped] Import translations. DO NOT MERGE
...
am: 86dfbd6254
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
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
Arc Wang
40f22313dc
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
...
am: ec3055b9eb
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
2019-09-11 22:57:29 -07:00
Bill Yi
c46430c80e
[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours
...
am: e6107df474
2019-09-11 22:57:28 -07:00
Bill Yi
525b411585
[automerger skipped] Import translations. DO NOT MERGE
...
am: deee385ba8
2019-09-11 22:54:54 -07:00
Bill Yi
e6107df474
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8173de150d
2019-09-11 22:50:29 -07:00
Bill Yi
9b956eb47f
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8173de150d
2019-09-11 22:50:27 -07: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: 827172cee17195e05dfa
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: aac7f8e2cd7195e05dfa
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
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
2019-09-11 12:09:59 -07:00
