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
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
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
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
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
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
Joshua Mccloskey
9b79a4c902
Merge "String update." into qt-r1-dev
...
am: b471e2439c
Change-Id: I63a30632336f2df104440ed4e51c3d76d4f2aa9f
2019-05-30 16:32:47 -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
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
Colin Cross
8ddf9e7e3f
Merge "Convert Settings to Android.bp"
...
am: 06dfd75660
Change-Id: Ie863baa7e286a44a8e13b4c5e162f4fecc57de74
2019-05-30 14:37:45 -07:00
Julia Reynolds
cffcc4cb42
Merge "Change notification alert icon" into qt-dev am: 2821456995
...
am: 72182e1ffc
Change-Id: I59f6af8e04981f9c0c3053f58d41b7461c1101b1
2019-05-30 14:26:01 -07:00
Julia Reynolds
71420a2209
Merge "Change notification alert icon" into qt-dev am: 2821456995
...
am: f5afaffc2c
Change-Id: I340a6394fece9fe398e92c219b3a186db341001c
2019-05-30 14:22:17 -07:00
Salvador Martinez
a2e7357535
Change switch text color to black in dark mode
...
It seems that the attribute values that are used to text color
in the switch bar are selectors which leads to problems because
they include an alpha value when the switch is "off". This would
cause the contrast between the text and the background to be too
low for GAR. This CL simply makes it so that in dark mode the text
for the switch bar is just true black since adjusting the
attributes would have wide scale implications for all UIs using
device default themes.
Test: visual inspection
Bug: 132755745
Change-Id: I309db82e9bf020fb654e0b93f6ec84380ae092f7
2019-05-30 14:16:52 -07:00
Julia Reynolds
72182e1ffc
Merge "Change notification alert icon" into qt-dev
...
am: 2821456995
Change-Id: I7b38e88e702ce91162f29592c69dcc4f8612181d
2019-05-30 14:11:52 -07:00
Julia Reynolds
f5afaffc2c
Merge "Change notification alert icon" into qt-dev
...
am: 2821456995
Change-Id: I5877100513be3b2e17d6074bedc5237fcf5ac772
2019-05-30 14:08:51 -07:00
Colin Cross
06dfd75660
Merge "Convert Settings to Android.bp"
2019-05-30 21:08:37 +00:00
Julia Reynolds
a87f740d90
Reorder notification settings
...
Test: manual
Fixes: 132271798
Change-Id: I57e726a332513620bea25b97345b1a8564c6d5ef
2019-05-30 16:52:08 -04:00
TreeHugger Robot
2821456995
Merge "Change notification alert icon" into qt-dev
2019-05-30 20:51:49 +00:00
Christine Franks
d28539d045
Merge "Add SIM color picker" into qt-dev am: b747c5c270
...
am: 02c4e123b7
Change-Id: I1f37ffa348b5330d17a1aad5caff94d12136f9e9
2019-05-30 13:48:43 -07:00
Christine Franks
3ccc01ca18
Merge "Add SIM color picker" into qt-dev am: b747c5c270
...
am: c1c4a0858d
Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7
Merge "Add SIM color picker" into qt-dev
...
am: b747c5c270
Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
2019-05-30 13:26:55 -07:00
Christine Franks
c1c4a0858d
Merge "Add SIM color picker" into qt-dev
...
am: b747c5c270
Change-Id: Ia234bd596017cf98dd5a76202c6fe7af486562f4
2019-05-30 13:20:46 -07:00
Christine Franks
b747c5c270
Merge "Add SIM color picker" into qt-dev
2019-05-30 20:01:48 +00:00
Julia Reynolds
80bcae426d
Merge "Fix a11y readout of notification importance buttons" into qt-dev am: 1b25f986cb
...
am: 0a4dce78c1
Change-Id: I8494b145e87e1878929b4ff01a753746f76723e8
2019-05-30 12:18:00 -07:00
Julia Reynolds
9ae4df15fd
Merge "Fix a11y readout of notification importance buttons" into qt-dev am: 1b25f986cb
...
am: 9e865f88be
Change-Id: Icd84f4b664f5aaa58cca23c2c89b9a4c3412981d
2019-05-30 12:16:41 -07:00
Julia Reynolds
9e865f88be
Merge "Fix a11y readout of notification importance buttons" into qt-dev
...
am: 1b25f986cb
Change-Id: I7c94082364ef16412ef2613003c91881905ba12a
2019-05-30 12:10:23 -07:00
Julia Reynolds
0a4dce78c1
Merge "Fix a11y readout of notification importance buttons" into qt-dev
...
am: 1b25f986cb
Change-Id: Ia42d67cab34dfb380d5be909f22f717f8ecfd5b6
2019-05-30 12:09:22 -07:00
TreeHugger Robot
1b25f986cb
Merge "Fix a11y readout of notification importance buttons" into qt-dev
2019-05-30 18:53:57 +00:00