Commit Graph

52428 Commits

Author SHA1 Message Date
Kevin Chang
d77b10c7de Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d
am: f8baacfe7f

Change-Id: Ib84258c2340009a9569e526308fc8114bdd71dea
2019-05-18 01:28:06 -07:00
Kevin Chang
f8baacfe7f Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
am: f508ece42d

Change-Id: I1c01a995f3cacdd80f5f97bce342dd0ce0907fe2
2019-05-18 01:24:02 -07:00
Kevin Chang
f508ece42d Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev 2019-05-18 08:09:43 +00:00
Joel Galenson
fffdc8461b Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622
am: 14f64a0acf

Change-Id: I8413793208a829db4fe1637a22bb16a7181db124
2019-05-17 20:35:24 -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
14f64a0acf Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
am: 51c92e5622

Change-Id: I677c4b76f44aa957eddf73d70c3291a4626f4903
2019-05-17 19:35:47 -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
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
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
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
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
Kevin Chang
d8927cbabf Revert "Change string of switchbar and installed service category title"
This reverts commit 7eddb0e4dc.

Reason for revert: There's some side effects with string.
Create a new CL in master branch to fix it.

Bug: 132840332
Change-Id: I17526a06474d25bdb32beda96f5bb6371f0e5ade
2019-05-17 08:38:54 +00: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
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
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
joshmccloskey
f5cbb30b04 Added information icon
am: 8fd6269f40

Change-Id: Ic1de71704ff41a7916eb5cd9f87f93b7983f15fe
2019-05-16 19:15:28 -07:00
Joshua Mccloskey
4a6d3f6403 Merge "Modified string" into qt-r1-dev 2019-05-17 02:10:24 +00:00
Xin Li
0a8e4aebf5 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." 2019-05-17 00:58:08 +00:00
Kevin Chyn
8737949f0e De-dupe animation name
Bug: 132916308

Test: Builds
Change-Id: Ief29915641826a270f54adc3752b62cd9ee99ebe
2019-05-16 17:06:37 -07:00
Lei Yu
c15ca62386 Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62
am: 28e19d2883

Change-Id: I57765cf4f1adb41b6e2c2885f210ec366bc14811
2019-05-16 13:25:45 -07:00
Lei Yu
bbf4219bf0 Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62
am: d6bdbfabc7

Change-Id: I74cc36427decbbdf7ccc58a2b0cb9d4cd2dcff48
2019-05-16 12:33:13 -07:00
Alexey Kuzmin
a8378744cb Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200
am: 486b89da28

Change-Id: Ibaecc9622270e13c25284905235c3c64fd0ea1e7
2019-05-16 12:15:08 -07:00
Alexey Kuzmin
cec630a67a Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200
am: bfcf644bed

Change-Id: Ic87e16fd98b702ec64c50f4199af733db017370f
2019-05-16 12:12:08 -07:00
joshmccloskey
8fd6269f40 Added information icon
Bug: 132820419
Test: Manual.
Change-Id: If67a0ab96e9991f117e0a93c70a77266473b1df8
2019-05-16 19:10:15 +00:00
joshmccloskey
6513beb966 Modified string
Fixes: 132650058
Test: Builds.
Change-Id: I41e3b52570ec7e789692a179aaad96320de3db3a
2019-05-16 19:09:28 +00:00
Lei Yu
28e19d2883 Merge "Use short summary in advanced BT header" into qt-dev
am: b6012f8d62

Change-Id: Ibb3270dc2ecf9dfd942fe17f9aa9fb65369a1654
2019-05-16 11:58:25 -07:00
Lei Yu
d6bdbfabc7 Merge "Use short summary in advanced BT header" into qt-dev
am: b6012f8d62

Change-Id: Ib222bc7eb04ce08942d7da6dfc5ef7dd07b7e129
2019-05-16 11:58:16 -07:00
Lei Yu
b6012f8d62 Merge "Use short summary in advanced BT header" into qt-dev 2019-05-16 18:18:45 +00:00
Alexey Kuzmin
bfcf644bed Merge "Fix usage hint of ringtone vibration preview" into qt-dev
am: 71f6523200

Change-Id: I5525f5de544a5eb51fdcc7b832ab4a3c3b2ad2d8
2019-05-16 11:08:45 -07:00
Alexey Kuzmin
486b89da28 Merge "Fix usage hint of ringtone vibration preview" into qt-dev
am: 71f6523200

Change-Id: Ia81d515bc26a87b636da2d1ce6e65ae5051cc405
2019-05-16 11:05:29 -07:00
Leon Liao
72dd2e8079 Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
am: e51e69284c

Change-Id: I4ae93049dee05c78106b6b0c2383b65d10bf3000
2019-05-16 10:12:03 -07:00
TreeHugger Robot
71f6523200 Merge "Fix usage hint of ringtone vibration preview" into qt-dev 2019-05-16 16:51:32 +00:00
Pavel Grafov
f59ce06159 Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2
am: 72b85a3798

Change-Id: I8daf4f4a34631700b6e3b62bcc24a9f3554fbad6
2019-05-16 09:13:35 -07:00
Kevin Chyn
9c5ee1901a Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d
am: 931b2dbf09

Change-Id: Iaf67be105743793899c7ca17110059a8186602e3
2019-05-16 08:33:28 -07:00