Commit Graph

54476 Commits

Author SHA1 Message Date
Joel Galenson
0709624634 Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
am: 58246f66db

Change-Id: I87733a341c28ebd6bbaa3bfe846fc835dc4a745e
2019-05-31 06:12:29 -07:00
Joel Galenson
4e6553d435 Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
am: d8efe209f7

Change-Id: I74cc8a834e40712dfc30e57768a7a603cd6bb5b6
2019-05-31 06:12:27 -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

Change-Id: I4d086debe20235d132fd62d96441c358ffe01b48
2019-05-31 06:07:30 -07:00
Joel Galenson
58246f66db Merge "Remove Permissions Hub." into qt-dev
am: 63088840c4

Change-Id: I59cef5b593630d75b6db51ae324c94f9dc3a8841
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

Change-Id: I067abe881c9ac0f511cf184343c12a6ac74d1e9d
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

Change-Id: I8c0512ac98aecfb3306ee89e3a4ff1e711f45d89
2019-05-30 21:27:15 -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

Change-Id: I83e1cf3c191023b056c7f20e0f31577fd311e7ca
2019-05-30 20:46:28 -07:00
Colin Cross
cde28793cd Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d
am: 2d7cf1d924

Change-Id: I17cd8ae5326176f8451fd81af0d468326403a9ed
2019-05-30 20:28:58 -07:00
Colin Cross
2d7cf1d924 Merge "Make test_options.timeout an int64" am: c56651b345
am: 001b1c556d

Change-Id: I3ed30fbfadfd6c821bb7246d0abba19b9fb00ce6
2019-05-30 20:24:25 -07:00
Colin Cross
001b1c556d Merge "Make test_options.timeout an int64"
am: c56651b345

Change-Id: If57d4ce65e9e55e89c6e41376b1fa08447062666
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

Change-Id: Id1f442fbfbe8d2fe63a7fcb5b4e1bce5dfb7e7bc
2019-05-30 18:15:06 -07:00
Ilya Matyukhin
c6f766ec2b Merge "Add generateChallenge() in onResume()" into qt-r1-dev
am: dbe399a023

Change-Id: Ie6c6b6cb22ba783ee402e5c9fb0cae510c6f8fdf
2019-05-30 18:10:09 -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 -s ours
am skip reason: subject contains skip directive

Change-Id: I68b6813309e1742ceb439f0ca223783791f46b0b
2019-05-30 18:00:58 -07: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 -s ours
am skip reason: subject contains skip directive

Change-Id: I5e248c36376097e7399d6454c14f9c1e127c2160
2019-05-30 17:56:08 -07: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 -s ours
am skip reason: subject contains skip directive

Change-Id: I1c6b00133e923a3244304e129869debba5f3f1b9
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 -s ours
am skip reason: subject contains skip directive

Change-Id: I02e30980ecd606b9e18dfe1f61af71e0c01706fa
2019-05-30 17:47:52 -07:00
Bill Yi
71edc54326 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d1ddb16617 -s ours
am skip reason: subject contains skip directive

Change-Id: I86d2ea6736d4765940832bd48b4d37a9bb5046b7
2019-05-30 17:42:52 -07:00
Bill Yi
f78ed7078e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d1ddb16617 -s ours
am skip reason: subject contains skip directive

Change-Id: Id0af6c3c08db79fbfa30f6c50f3e404d5011a9e5
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

Change-Id: I310df214301362a841a37f8b8762a9bbae67d7d1
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
9b79a4c902 Merge "String update." into qt-r1-dev
am: b471e2439c

Change-Id: I63a30632336f2df104440ed4e51c3d76d4f2aa9f
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

Change-Id: Id621a398191568a76ed1e5bce00a63ad48a22f86
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
ac7851e1ce Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
am: fa127bd6f7

Change-Id: Ie61452dd21b1d3d6183edab66c01b51d39c008da
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

Change-Id: Ie66c72179ee3616ac2075d2a985050808f8f0380
2019-05-30 15:38:44 -07:00
Mehdi Alizadeh
e1ad225a51 Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f am: 4937d4ca1f
am: 97f5ab6fac

Change-Id: I634d14637d8d9be256b7efb85d63969cc1473eac
2019-05-30 15:37:57 -07:00
Colin Cross
ab93f00e11 [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 am: 8ddf9e7e3f -s ours am: c1b598b218 -s ours
am: 243ed56948 -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: I851b13ea1260eb67e615966c3af8d52644fbd14a
2019-05-30 15:23:14 -07:00
Mehdi Alizadeh
6db3e8bf18 Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f
am: 5d77656d5d

Change-Id: Ia6a3e930209d6c182f063ecc9c7fe786db73f7fb
2019-05-30 15:20:20 -07:00
Mehdi Alizadeh
97f5ab6fac Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f
am: 4937d4ca1f

Change-Id: Ib4f85a72db8e8d36e5016c90857c532195632904
2019-05-30 15:19:22 -07:00
Bill Yi
bd1ab2754b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6da271a883e0a62cc5f32890c3411e64ef856fa7
2019-05-30 15:17:06 -07:00
Mehdi Alizadeh
4937d4ca1f Merge "Increase char limit to 60 for string translation" into qt-dev
am: 178d4a7f8f

Change-Id: I8369dc9dc525652253f4d5a8945725b09268470c
2019-05-30 15:16:16 -07:00
Mehdi Alizadeh
5d77656d5d Merge "Increase char limit to 60 for string translation" into qt-dev
am: 178d4a7f8f

Change-Id: Ia7882da10d3f323234267cbec3ea1136214fd974
2019-05-30 15:14:15 -07:00
TreeHugger Robot
178d4a7f8f Merge "Increase char limit to 60 for string translation" into qt-dev 2019-05-30 22:04:47 +00:00
Ilya Matyukhin
d59150eca6 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
2019-05-30 15:01:22 -07:00
Lucas Dupin
8c29afdc3f Fix exception on non face-enabled devices
Test: open privacy settings page
Bug: 130327302
Change-Id: I31ba9f30bb7300bff6daea8a51ed6c4dc2a373f2
2019-05-30 14:58:52 -07:00
Colin Cross
243ed56948 [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 am: 8ddf9e7e3f -s ours
am: c1b598b218 -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: Id148a1ec77e363cc5e7f2cbe94adb172377107af
2019-05-30 14:53:04 -07:00
Colin Cross
c1b598b218 [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660
am: 8ddf9e7e3f -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: I8e7fd2f64f6ccd6ba0f8ef2809a93322a46ac87a
2019-05-30 14:45:35 -07:00