Joel Galenson
|
02ab9a74fd
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622 am: 31db115319
am: e0a10aedd6
Change-Id: Ief4493e730eef4d345e2c7edf725c07a74c9c0c7
|
2019-05-17 22:00:08 -07:00 |
|
Fan Zhang
|
2f730260db
|
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b am: 909b2192cb
am: 856078fc50
Change-Id: I4fe4362b115b2c18d938505d8fb71344fc95bedc
|
2019-05-17 21:58:56 -07:00 |
|
Fan Zhang
|
9842725a23
|
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b am: bc58c1f129
am: b8ac55aec0
Change-Id: I1594f80c15fd663c706164384c463633eedea264
|
2019-05-17 21:57:36 -07:00 |
|
Alexey Kuzmin
|
7a48111584
|
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7 am: 09bc5975a4
am: 2fc186cef2
Change-Id: I8743f99ec559c848a2ee8159d84d68d156e51bdc
|
2019-05-17 21:56:39 -07:00 |
|
Alexey Kuzmin
|
12f1fc8b94
|
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7 am: aa580944a6
am: 3f6dd2c01d
Change-Id: I969d24144d2ba9f07a4e47c96f2c220e91bf0a98
|
2019-05-17 21:55:43 -07:00 |
|
Joel Galenson
|
e0a10aedd6
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622
am: 31db115319
Change-Id: I4ba39337851dc106588a78f871d8457cb23d3205
|
2019-05-17 20:17:02 -07:00 |
|
Joel Galenson
|
31db115319
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
am: 51c92e5622
Change-Id: If6446cd203ff92753d6d697e570178cbfd72cd47
|
2019-05-17 19:25:42 -07:00 |
|
TreeHugger Robot
|
51c92e5622
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
|
2019-05-18 01:47:09 +00:00 |
|
Fan Zhang
|
856078fc50
|
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
am: 909b2192cb
Change-Id: I8c789433dc5d31775f5716ac4271b679f76a0637
|
2019-05-17 17:16:08 -07:00 |
|
Fan Zhang
|
b8ac55aec0
|
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
am: bc58c1f129
Change-Id: I324f3e67e41646fd673afdacc7ee9e59ec5772ae
|
2019-05-17 17:11:18 -07:00 |
|
Fan Zhang
|
909b2192cb
|
Merge changes I06c1bc14,I5415b8ed into qt-dev
am: a83638788b
Change-Id: Ied606e581e3c63e9f6fa4f455959caf4b2870edf
|
2019-05-17 16:43:01 -07:00 |
|
Fan Zhang
|
bc58c1f129
|
Merge changes I06c1bc14,I5415b8ed into qt-dev
am: a83638788b
Change-Id: If774abf9364a66eca020f65a5f2122c1faf5401a
|
2019-05-17 16:32:11 -07:00 |
|
Marc Plano-Lesay
|
336b2baa6f
|
Merge "Make the private DNS mode dialog entries full width."
|
2019-05-17 22:44:15 +00:00 |
|
TreeHugger Robot
|
a83638788b
|
Merge changes I06c1bc14,I5415b8ed into qt-dev
* changes:
Clean up a STOPSHIP string
Fix view overlap in wifi dpp enrollment.
|
2019-05-17 22:41:26 +00:00 |
|
Kevin Chyn
|
82ee26b6c1
|
Merge "De-dupe animation name" into qt-r1-dev am: f0581b95fa
am: 2573421a79
Change-Id: I66cc2633ae230ce1eaf5c2fd0483e333f47e65b1
|
2019-05-17 14:48:45 -07:00 |
|
Xin Li
|
236d27b93f
|
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: 0a8e4aebf5 -s ours am: 148da1edf8 -s ours am: 5f726765e5
am: 62b108d19f -s ours
am skip reason: subject contains skip directive
Change-Id: I358e13d6d0e3db61fc8fb71eb5bd553dcee9031e
|
2019-05-17 13:52:04 -07:00 |
|
Fan Zhang
|
1f8cc8f96d
|
Clean up a STOPSHIP string
Bug: 110557011
Test: rebuild
Change-Id: I06c1bc1460cbb47feb6152298151477549a9e411
|
2019-05-17 13:44:01 -07:00 |
|
Fan Zhang
|
a10d3cfc78
|
Fix view overlap in wifi dpp enrollment.
Fixes: 132813855
Test: visual
Change-Id: I5415b8edaf1ce5ae122e4d1ee41e65ca825f72e6
|
2019-05-17 12:58:50 -07:00 |
|
Android Build Merger (Role)
|
f16d4fb7a7
|
Merge "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours am: af42065ea6 -s ours am: e5107ffba2 am: 0d61126115 -s ours am skip reason: subject contains skip directive"
|
2019-05-17 19:32:24 +00:00 |
|
Xin Li
|
4ee7ab0563
|
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours am: af42065ea6 -s ours am: e5107ffba2
am: 0d61126115 -s ours
am skip reason: subject contains skip directive
Change-Id: I5ec8b2d026af0106c90e71769f23562fc8558b14
|
2019-05-17 12:11:25 -07:00 |
|
Android Build Merger (Role)
|
18a8434165
|
Merge changes from topic "am-4f4390cd81144667b143214eb38ca2b9"
* changes:
Merge "Modified string" into qt-r1-dev am: 4a6d3f6403 am: a396a8c1ba
Added information icon am: 8fd6269f40 am: f5cbb30b04
|
2019-05-17 19:11:03 +00:00 |
|
Joshua Mccloskey
|
084f457ab8
|
Merge "Modified string" into qt-r1-dev am: 4a6d3f6403
am: a396a8c1ba
Change-Id: I191cc36f99334b4fa9f53aecc905ba68d066b366
|
2019-05-17 11:50:59 -07:00 |
|
joshmccloskey
|
7a8b7698fd
|
Added information icon am: 8fd6269f40
am: f5cbb30b04
Change-Id: I46d1ee2922e6c3f92b91c74e785ad63584c4e7f6
|
2019-05-17 11:49:59 -07:00 |
|
Joel Galenson
|
e4c8efe245
|
Show the accessibility usage preference when Permissions Hub is disabled.
Fixes: 132909181
Test: See dialog with Permissions Hub disabled.
Test: atest AccessibilityUsagePreferenceControllerTest
Change-Id: I56a433d561b0d77d8ece0fd6752871fa79cec850
|
2019-05-17 10:19:49 -07:00 |
|
TreeHugger Robot
|
7be4b6d655
|
Merge "Fix multiple instances for Google SignIn activity appearing in task stack"
|
2019-05-17 16:44:54 +00:00 |
|
Alexey Kuzmin
|
2fc186cef2
|
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7
am: 09bc5975a4
Change-Id: Ie42fcbe315d29b8ea8ff56171814d3ec0915715d
|
2019-05-17 07:32:34 -07:00 |
|
Alexey Kuzmin
|
3f6dd2c01d
|
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7
am: aa580944a6
Change-Id: Ib99e882054761d93657103bc0bdab7ed09c7e4c2
|
2019-05-17 07:27:24 -07:00 |
|
Alexey Kuzmin
|
09bc5975a4
|
Merge "Play vibration preview when turning on vibration" into qt-dev
am: 1a82d653f7
Change-Id: I7a1d856cdede78d708ecc9601832a0d86bf42e20
|
2019-05-17 07:18:46 -07:00 |
|
Alexey Kuzmin
|
aa580944a6
|
Merge "Play vibration preview when turning on vibration" into qt-dev
am: 1a82d653f7
Change-Id: Id403a259ae8302ca9b2ec82710f719f11f54c4b9
|
2019-05-17 07:15:50 -07:00 |
|
TreeHugger Robot
|
1a82d653f7
|
Merge "Play vibration preview when turning on vibration" into qt-dev
|
2019-05-17 13:59:43 +00:00 |
|
Lei Yu
|
9a3984123c
|
Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62 am: 28e19d2883
am: c15ca62386
Change-Id: Id8b843451db63c5487d4bbfc514d12650796dc8c
|
2019-05-17 06:10:42 -07:00 |
|
Lei Yu
|
e615e50cf3
|
Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62 am: d6bdbfabc7
am: bbf4219bf0
Change-Id: Iacaece69875fceebace363859292b560886be8bf
|
2019-05-17 05:32:47 -07:00 |
|
Alexey Kuzmin
|
619c667c56
|
Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200 am: 486b89da28
am: a8378744cb
Change-Id: I405fefb68145f41b1bfb62a24a0e3d5cace3980c
|
2019-05-17 05:31:44 -07:00 |
|
Alexey Kuzmin
|
a6488be950
|
Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200 am: bfcf644bed
am: cec630a67a
Change-Id: I01b8ee39edc7034c21968909fdf5a892b5b91f7b
|
2019-05-17 05:30:49 -07:00 |
|
Leon Liao
|
21183ba013
|
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1 am: e51e69284c
am: 72dd2e8079
Change-Id: I4c2b8cd639ca1642fc5c0b183f3bb3a64b31355b
|
2019-05-17 05:29:48 -07:00 |
|
Pavel Grafov
|
74f247d7df
|
Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2 am: 72b85a3798
am: f59ce06159
Change-Id: Id3c7af34d5908bd5dbb826fdce88ef60555582da
|
2019-05-17 03:36:32 -07:00 |
|
Kevin Chyn
|
36902a775c
|
Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d am: 931b2dbf09
am: 9c5ee1901a
Change-Id: Ibfcbc97c0d9367972e28c9b5adf185b7a160f5ed
|
2019-05-17 03:35:29 -07:00 |
|
Kevin Chang
|
da907b25f0
|
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44 am: 55bfbfed1a
am: 4fedf61fc6
Change-Id: Ieed4b97a7d0eab7fe884b3d78c6b930bcfbf392d
|
2019-05-17 03:34:33 -07:00 |
|
Leon Liao
|
3d7d5a4c66
|
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1 am: dfae7fe0e0
am: 9eda4b017e
Change-Id: I4e54d9ea6438c44a217faa92988602238f39b5ec
|
2019-05-17 00:38:05 -07:00 |
|
Kevin Chyn
|
2573421a79
|
Merge "De-dupe animation name" into qt-r1-dev
am: f0581b95fa
Change-Id: I675d8618a9a1f93526e83cd52bb1ca9719d14006
|
2019-05-17 00:30:20 -07:00 |
|
Xin Li
|
62b108d19f
|
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: 0a8e4aebf5 -s ours am: 148da1edf8 -s ours
am: 5f726765e5
Change-Id: I9de30c875c828c5c038cafcf2a9ff8db7400bf1c
|
2019-05-16 23:50:04 -07:00 |
|
Kevin Chyn
|
f0581b95fa
|
Merge "De-dupe animation name" into qt-r1-dev
|
2019-05-17 05:58:43 +00:00 |
|
Xin Li
|
0d61126115
|
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours am: af42065ea6 -s ours
am: e5107ffba2
Change-Id: I341d55b99c332001907912641f6a6acb14423f76
|
2019-05-16 22:58:32 -07:00 |
|
Pavel Grafov
|
4b6571849e
|
Merge "Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2 am: 52f1e826e9" into qt-r1-dev-plus-aosp
am: 79ecab0822
Change-Id: Ia0ea30825321a4f9262f2ee5a7692c62f7d7ee5b
|
2019-05-16 21:58:23 -07:00 |
|
Xin Li
|
5f726765e5
|
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: 0a8e4aebf5 -s ours
am: 148da1edf8 -s ours
am skip reason: subject contains skip directive
Change-Id: I3d6681d652e934742b82cd55160a492005552aac
|
2019-05-16 21:53:09 -07:00 |
|
Xin Li
|
e5107ffba2
|
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours
am: af42065ea6 -s ours
am skip reason: subject contains skip directive
Change-Id: I18b29424dfa9d23c687d1137cb1c2843b95946f3
|
2019-05-16 21:26:24 -07:00 |
|
Xin Li
|
148da1edf8
|
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."
am: 0a8e4aebf5 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibf11decc47dc2c10fcfea38a9fd10c93a321ee66
|
2019-05-16 20:45:16 -07:00 |
|
joshmccloskey
|
88582128aa
|
Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3 am: ecb58423a3
am: 3bea5a13b1
Change-Id: I7e5d3357d07ab807cea936364c8762ce6b388b06
|
2019-05-16 20:29:43 -07:00 |
|
Xin Li
|
af42065ea6
|
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
am: 87f090ba57 -s ours
am skip reason: subject contains skip directive
Change-Id: I2fb161dff7084788c521c82344a5ebb2dc5cc929
|
2019-05-16 19:22:57 -07:00 |
|
Joshua Mccloskey
|
a396a8c1ba
|
Merge "Modified string" into qt-r1-dev
am: 4a6d3f6403
Change-Id: I7b16f828ec9618181bbb4c0a178f22b5db592a52
|
2019-05-16 19:16:15 -07:00 |
|