Joel Galenson
5a9c0f861e
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: 58246f66db
...
am: 0709624634
2019-05-31 06:17:32 -07:00
Android Build Merger (Role)
6b0da3c2af
Merge "Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: d8efe209f7" into qt-r1-dev-plus-aosp
2019-05-31 13:12:50 +00:00
Joel Galenson
0709624634
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
...
am: 58246f66db
2019-05-31 06:12:29 -07:00
Joel Galenson
4e6553d435
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
...
am: d8efe209f7
2019-05-31 06:12:27 -07:00
Joel Galenson
dce770dae2
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
...
am: 58246f66db
2019-05-31 06:12:23 -07:00
Kevin Yao
4594c51be0
Fix typo for Accessibility permission dialog
...
Bug: 133362697
Test: Visual
Change-Id: I9dfe9218c1b41cf02257bbfdbe3128f952a9a97c
2019-05-31 21:08:37 +08:00
Joel Galenson
d8efe209f7
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
2019-05-31 06:07:30 -07:00
Joel Galenson
58246f66db
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
2019-05-31 06:07:29 -07:00
TreeHugger Robot
63088840c4
Merge "Remove Permissions Hub." into qt-dev
2019-05-31 13:02:12 +00:00
zoey chen
3aa9c79341
UE showed wrong title and message when enabling data roaming.
...
It set wrong string when building the roaming dialog.
BUG: 133731388
Test: Manual test
Change-Id: Ib46b2b2ba1d62f84da7cd82bbbc03fe4f3069afc
2019-05-31 17:37:26 +08:00
Lucas Dupin
ff5dde9f05
Merge "Fix exception on non face-enabled devices" into qt-r1-dev am: 1a3112ab32
...
am: d3e686fc33
2019-05-30 21:33:17 -07:00
TreeHugger Robot
c0fbb533d2
Merge "Guard NPE when using search view"
2019-05-31 04:27:43 +00:00
Lucas Dupin
d3e686fc33
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
...
am: 1a3112ab32
2019-05-30 21:27:15 -07:00
Lucas Dupin
dc8500209f
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
...
am: 1a3112ab32
2019-05-30 21:27:13 -07:00
TreeHugger Robot
1a3112ab32
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
2019-05-31 04:15:54 +00:00
Colin Cross
dc67600f18
Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d am: 2d7cf1d924
...
am: cde28793cd
2019-05-30 20:46:28 -07:00
Colin Cross
cde28793cd
Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d
...
am: 2d7cf1d924
2019-05-30 20:28:58 -07:00
Colin Cross
2d7cf1d924
Merge "Make test_options.timeout an int64" am: c56651b345
...
am: 001b1c556d
2019-05-30 20:24:25 -07:00
Colin Cross
001b1c556d
Merge "Make test_options.timeout an int64"
...
am: c56651b345
2019-05-30 20:19:07 -07:00
Colin Cross
c56651b345
Merge "Make test_options.timeout an int64"
2019-05-31 03:11:22 +00:00
TreeHugger Robot
46a221434b
Merge "Fixed the IllegalStateException on removing account"
2019-05-31 03:04:48 +00:00
tmfang
f841748be3
Guard NPE when using search view
...
Test: This crash pattern was observed from monkey test, I can't reproduce it.
So, just rebuild rom.
Fixes: 132819226
Change-Id: I0726524dcf8e1622d64f75c17b3600a7440b58c2
2019-05-31 10:47:30 +08:00
Ilya Matyukhin
803630c74b
Merge "Add generateChallenge() in onResume()" into qt-r1-dev am: dbe399a023
...
am: c6f766ec2b
2019-05-30 18:15:06 -07:00
Ilya Matyukhin
c6f766ec2b
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
...
am: dbe399a023
2019-05-30 18:10:09 -07:00
Ilya Matyukhin
ee909b418a
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
...
am: dbe399a023
2019-05-30 18:04:02 -07:00
Bill Yi
f0b3101b24
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours am: 71edc54326 -s ours
...
am: d31d5fca30
2019-05-30 18:00:58 -07:00
android-build-team Robot
5e9a8a0b99
Merge cherrypicks of [7825093, 7824346, 7824349, 7823902, 7823903, 7825189, 7825190, 7825191, 7825192, 7825193, 7825195, 7825196, 7825197, 7825204, 7825205, 7825206, 7825207, 7825208, 7825209, 7825210, 7825211, 7825618, 7825619, 7825620, 7825621, 7825622, 7825623, 7825521, 7825522, 7825523, 7825524, 7825525, 7825698, 7825699] into qt-c2f2-release
...
Change-Id: I6ece4b4fa6b5537024b650d8c1f6af66b45fcb3c
2019-05-31 00:56:49 +00:00
Bill Yi
093c8e49a0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours am: f78ed7078e -s ours
...
am: b7cc89cf2d
2019-05-30 17:56:08 -07:00
Ilya Matyukhin
7e8cb7bed9
Add generateChallenge() in onResume()
...
Fixes: 133498264
Fixes: 133440610
Test: open FaceSettings from Settings with and without an enrolled face
Test: open FaceSettings from the notification that asks to re-enroll
Change-Id: I80ca7644f96a538614962232fb3951d1a91d87c7
(cherry picked from commit d59150eca6
2019-05-31 00:52:42 +00:00
joshmccloskey
4bcd858aa8
String update.
...
Test: Manual.
Bug: 133783098
Change-Id: If8ea2b6c9372a3da02b93b815f76e3143cc54dea
(cherry picked from commit 5ef0a1d11d
2019-05-31 00:52:38 +00:00
Lucas Dupin
2dc23dae48
Add setting to bypass lock screen
...
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockscreenBypassPreferenceControllerTest
Bug: 130327302
Change-Id: I324c6e384480fa8576ba58d0bf73c1ef20484ee0
(cherry picked from commit b2aaa26f38
2019-05-31 00:52:34 +00:00
TreeHugger Robot
dbe399a023
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
2019-05-31 00:52:11 +00:00
Bill Yi
d31d5fca30
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours
...
am: 71edc54326
2019-05-30 17:49:56 -07:00
Bill Yi
b7cc89cf2d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours
...
am: f78ed7078e
2019-05-30 17:47:52 -07:00
Bill Yi
62a0fa3606
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours
...
am: 71edc54326
2019-05-30 17:47:50 -07:00
Bill Yi
71edc54326
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: d1ddb16617
2019-05-30 17:42:52 -07:00
Bill Yi
f78ed7078e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: d1ddb16617
2019-05-30 17:38:37 -07:00
TreeHugger Robot
d1ddb16617
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-31 00:30:42 +00:00
Fan Zhang
5f2d7f841d
Merge "Add slice uri to slice index db"
2019-05-31 00:02:25 +00:00
Fan Zhang
ec81d6121e
Override 2 getSliceUri() instance to return platform slice
...
Bug: 126222433
Test: robotest
Change-Id: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
2019-05-30 16:50:43 -07:00
Joshua Mccloskey
be79914c4f
Merge "String update." into qt-r1-dev am: b471e2439c
...
am: 9b79a4c902
2019-05-30 16:48:58 -07:00
Fan Zhang
f36ca50ec7
Add slice uri to slice index db
...
And slightly refactored the SliceDataConverter to remove 1 reflection.
Bug: 126222433
Test: robotest
Change-Id: Ic5782bdd71f5c9cb77879a35de81dc61c01d1912
2019-05-30 16:47:31 -07:00
Joshua Mccloskey
efb4757e03
Merge "String update." into qt-r1-dev
...
am: b471e2439c
2019-05-30 16:34:49 -07:00
Joshua Mccloskey
9b79a4c902
Merge "String update." into qt-r1-dev
...
am: b471e2439c
2019-05-30 16:32:47 -07:00
Alex Salo
88e3adce68
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev am: fa127bd6f7
...
am: ac7851e1ce
2019-05-30 16:31:17 -07:00
Joshua Mccloskey
b471e2439c
Merge "String update." into qt-r1-dev
2019-05-30 23:12:53 +00:00
Alex Salo
6c1949edce
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
...
am: fa127bd6f7
2019-05-30 16:12:36 -07:00
Alex Salo
ac7851e1ce
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
...
am: fa127bd6f7
2019-05-30 16:12:36 -07:00
Alex Salo
fa127bd6f7
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
2019-05-30 22:59:12 +00:00
Mehdi Alizadeh
77d4025099
Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f am: 5d77656d5d
...
am: 6db3e8bf18
2019-05-30 15:38:44 -07:00
