Commit Graph

27192 Commits

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

Change-Id: I203137b6481999ca75be10996dac8a9e0fd4a71a
2019-05-18 05:21:30 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
71f6523200 Merge "Fix usage hint of ringtone vibration preview" into qt-dev 2019-05-16 16:51:32 +00:00
Kevin Chang
be59ae7350 Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44 am: d3a6120581
am: ad5ff19118

Change-Id: Ic321ec1ae0126f2d490a637c110e164bc5b20f2d
2019-05-16 09:31:38 -07:00
joshmccloskey
dd0c8c22b4 Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3 am: c684e636fc
am: 6f82bd76a5

Change-Id: Ibf7cf5e49941ab6a3ded713c729417a6b4bb0d61
2019-05-16 09:30:39 -07:00
Beverly
4ff1bbb172 Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd52b am: fd589a9980
am: 23b583f894

Change-Id: I327f0cf829e492b5068d93b905561c986b82a089
2019-05-16 09:28:49 -07:00
Kevin Chyn
75fdf1dc0c Merge "Update enroll to match mocks" into qt-dev am: dbe4384909 am: a4edd2b9a2
am: 4310498646

Change-Id: I5540ebd631e4f49a0414c7f85eb4d689d8fe2e41
2019-05-16 09:27:49 -07:00
Leon Liao
9eda4b017e Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
am: dfae7fe0e0

Change-Id: I14b955b57ebafbc99a656270c967cd3a7c5417e9
2019-05-16 07:50:37 -07:00
Leon Liao
e51e69284c Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
am: 764b8491e1

Change-Id: I8074cfd21490785952d180819c34dd383dff6ed3
2019-05-16 06:11:43 -07:00
Leon Liao
764b8491e1 Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev 2019-05-16 13:02:56 +00:00
Leon Liao
d741850f0c Modify Accessibility Setting UI for timeout feature
Using single timeout setting page instead of current two timeout pages
to keep the user experience simple and reduce confusion.

Current timeout page & API:
'Time to take action'
    --  Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS
'Time to read'
    --  Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS

New timeout page & API:
'Time to take action(Accessibility timeout)'
    --  Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS
    --  Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS

Bug: 132247225
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AccessibilityTimeoutControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AccessibilitySettingsTest
Change-Id: I0b69682425324d3b1e0ff3f7b6e2c299b60cd215
2019-05-16 18:58:50 +08:00
Jason Chiu
3e4d002679 Fix multiple instances for Google SignIn activity appearing in task stack
- Account page starts an activity with the flag FLAG_ACTIVITY_NEW_TASK
  to add an account and then causes multiple activity instances.
- Add the flag FLAG_ACTIVITY_CLEAR_TASK in conjunction with
  FLAG_ACTIVITY_NEW_TASK to clear existing task before the activity is
  started.

Fixes: 109923099
Test: robotest, manual
Change-Id: I8234ab33d8aa949e5ff78320962920cb0f8b2953
2019-05-16 17:50:46 +08:00
Lei Yu
d6ad2a3340 Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370 am: 2d0bf613e7
am: 0b758293c8

Change-Id: I45669bd49d533e17fa2aaa3c3a41f625bd955668
2019-05-16 00:50:41 -07:00
Fan Zhang
211a479817 Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13 am: b8cde6da35
am: 284789c41d

Change-Id: I98aeb638588e2d6964ff3dbd3ccca5a0a2bc86d5
2019-05-16 00:41:08 -07:00
Kevin Chang
ad5ff19118 Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44
am: d3a6120581

Change-Id: I9dd092a2cec7018aa7c3257f5e8244eb2ed4a60f
2019-05-15 23:17:11 -07:00
joshmccloskey
6f82bd76a5 Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3
am: c684e636fc

Change-Id: I504d4f969f8a2f7df3db28a74069ef03a7d4e834
2019-05-15 23:11:07 -07:00
Beverly
23b583f894 Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd52b
am: fd589a9980

Change-Id: I949e79f8cd95138d36901770c9324d0981149cbd
2019-05-15 23:04:07 -07:00
Kevin Chyn
4310498646 Merge "Update enroll to match mocks" into qt-dev am: dbe4384909
am: a4edd2b9a2

Change-Id: I50e01bc3a5169a840db2af3c7e836e1a039a0b52
2019-05-15 22:51:37 -07:00
Lei Yu
0b758293c8 Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370
am: 2d0bf613e7

Change-Id: Ib126893499663f636ceb244588dc8e4caf64ae44
2019-05-15 20:27:20 -07:00
Fan Zhang
284789c41d Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13
am: b8cde6da35

Change-Id: I6442ceb64367a73097f66edef35137679819b58f
2019-05-15 20:17:15 -07:00
Kevin Chang
55bfbfed1a Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev
am: 4891ea2d44

Change-Id: I514363a1d5ceb90435c0d6a960242503d6725c59
2019-05-15 19:00:30 -07:00
joshmccloskey
ecb58423a3 Merge "Re enable remove button after cancel" into qt-dev
am: b195c402f3

Change-Id: I5e93ad399778971bdc22112982184db562306c66
2019-05-15 18:58:57 -07:00
Kevin Chang
4891ea2d44 Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev 2019-05-16 01:10:11 +00:00
TreeHugger Robot
b195c402f3 Merge "Re enable remove button after cancel" into qt-dev 2019-05-16 00:51:26 +00:00
Beverly
52fa75463b Merge "Always include uid as part of recentApp key" into qt-dev
am: 08ef7bd52b

Change-Id: I2f30889666946880c3331b1727ce7b8e0de5658d
2019-05-15 17:32:04 -07:00
Kevin Chyn
e70836257c Merge "Update enroll to match mocks" into qt-dev
am: dbe4384909

Change-Id: I8c561725aa3cac2d4d6fd624c8f7be57faa9036f
2019-05-15 17:27:51 -07:00
Kevin Chang
a4a1055d7c Merge "Change string of switchbar and installed service category title" into qt-dev
am: d0c5f2d443

Change-Id: I48c62d62e2b4902adb800e5b62528b13f56ebccf
2019-05-15 17:27:22 -07:00