Kevin Chang
4fedf61fc6
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44
...
am: 55bfbfed1a
2019-05-16 08:13:15 -07:00
Leon Liao
9eda4b017e
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
...
am: dfae7fe0e0
2019-05-16 07:50:37 -07:00
Android Build Merger (Role)
79ecab0822
Merge "Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2 am: 52f1e826e9" into qt-r1-dev-plus-aosp
2019-05-16 14:44:00 +00:00
joshmccloskey
3bea5a13b1
Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3
...
am: ecb58423a3
2019-05-16 07:27:43 -07:00
Xin Li
ec2c2c299d
Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: e6eeb7bd55 -s ours
...
am: 90ecaab8f8
2019-05-16 06:13:48 -07:00
Leon Liao
dfae7fe0e0
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
...
am: 764b8491e1
2019-05-16 06:11:41 -07:00
Leon Liao
764b8491e1
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
2019-05-16 13:02:56 +00:00
Pavel Grafov
c9ff73c032
Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2
...
am: 52f1e826e9
2019-05-16 05:47:05 -07:00
Pavel Grafov
52f1e826e9
Merge "Make credential confirmation activity resizeable." into qt-dev
...
am: e455680bd2
2019-05-16 05:26:23 -07:00
Pavel Grafov
e455680bd2
Merge "Make credential confirmation activity resizeable." into qt-dev
2019-05-16 12:05:14 +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
Xin Li
924854583f
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: e6eeb7bd55 -s ours
...
am: f8a2db708b
2019-05-16 02:47:40 -07:00
Android Build Merger (Role)
478776a510
Merge "Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd52b am: 52fa75463b" into qt-r1-dev-plus-aosp
2019-05-16 07:32:11 +00:00
Beverly
c38c1c4bcd
Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd52b
...
am: 52fa75463b
2019-05-16 00:32:01 -07:00
Android Build Merger (Role)
b8bb3f2b2b
Merge "Merge "Update enroll to match mocks" into qt-dev am: dbe4384909 am: e70836257c" into qt-r1-dev-plus-aosp
2019-05-16 07:31:27 +00:00
Kevin Chyn
cb05b51fb4
Merge "Update enroll to match mocks" into qt-dev am: dbe4384909
...
am: e70836257c
2019-05-16 00:31:16 -07:00
Android Build Merger (Role)
cded060f7f
Merge "Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370 am: c48d4d2f28" into qt-r1-dev-plus-aosp
2019-05-16 07:30:35 +00:00
Lei Yu
4247221729
Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370
...
am: c48d4d2f28
2019-05-16 00:30:25 -07:00
Android Build Merger (Role)
a3d1be5957
Merge "Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13 am: 2fef4914b2" into qt-r1-dev-plus-aosp
2019-05-16 07:29:46 +00:00
Fan Zhang
c2e67e03f8
Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13
...
am: 2fef4914b2
2019-05-16 00:29:39 -07:00
Android Build Merger (Role)
5c0022b18e
Merge "Merge "Replace system navigation animations will smaller files" into qt-dev am: b9cb4ab062 am: a4803f3634" into qt-r1-dev-plus-aosp
2019-05-16 07:29:04 +00:00
Mehdi Alizadeh
0b0ba71a99
Merge "Replace system navigation animations will smaller files" into qt-dev am: b9cb4ab062
...
am: a4803f3634
2019-05-16 00:28:52 -07:00
Android Build Merger (Role)
342ae33d8e
Merge "Merge "Added icons for partial system update card in the Security category" into qt-dev am: 2e26605065 am: bfb45b6177" into qt-r1-dev-plus-aosp
2019-05-16 07:28:18 +00:00
Sorin Dinu
d58aefc32a
Merge "Added icons for partial system update card in the Security category" into qt-dev am: 2e26605065
...
am: bfb45b6177
2019-05-16 00:28:05 -07:00
Android Build Merger (Role)
a06b899360
Merge "Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443 am: bfed5d1ca1" into qt-r1-dev-plus-aosp
2019-05-16 07:27:30 +00:00
Kevin Chang
4fd093fbfa
Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443
...
am: bfed5d1ca1
2019-05-16 00:27:19 -07:00
Kevin Chyn
be969e7d6b
Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d
...
am: 71f07614b9
2019-05-15 23:24:28 -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
2019-05-15 23:17:11 -07:00
joshmccloskey
6f82bd76a5
Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3
...
am: c684e636fc
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
2019-05-15 23:04:07 -07:00
Kevin Chyn
4310498646
Merge "Update enroll to match mocks" into qt-dev am: dbe4384909
...
am: a4edd2b9a2
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
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
2019-05-15 20:17:15 -07:00
Mehdi Alizadeh
684f3b22c9
Merge "Replace system navigation animations will smaller files" into qt-dev am: b9cb4ab062
...
am: cfa4e2b734
2019-05-15 20:08:25 -07:00
Sorin Dinu
ef18f553fa
Merge "Added icons for partial system update card in the Security category" into qt-dev
...
am: 2e26605065
2019-05-15 19:55:16 -07:00
Kevin Chyn
71f07614b9
Merge "Update footer buttons depending on entry point" into qt-dev
...
am: 7411ce155d
2019-05-15 19:15:36 -07:00
Kevin Chang
d3a6120581
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev
...
am: 4891ea2d44
2019-05-15 19:14:13 -07:00
joshmccloskey
c684e636fc
Merge "Re enable remove button after cancel" into qt-dev
...
am: b195c402f3
2019-05-15 19:12:19 -07:00
Kevin Chang
55bfbfed1a
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev
...
am: 4891ea2d44
2019-05-15 19:00:30 -07:00
joshmccloskey
ecb58423a3
Merge "Re enable remove button after cancel" into qt-dev
...
am: b195c402f3
2019-05-15 18:58:57 -07:00
Kevin Chyn
7411ce155d
Merge "Update footer buttons depending on entry point" into qt-dev
2019-05-16 01:24:28 +00: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
Android Build Merger (Role)
90ecaab8f8
Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: e6eeb7bd55 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp
2019-05-16 01:07:57 +00:00
Kevin Chyn
2ac89c87c6
Update footer buttons depending on entry point
...
Bug: 130917883
Test: Manual
Change-Id: I8954f782dc26d0ceb6f55a9efe29c3e1b290c6bd
2019-05-15 18:03:26 -07:00
TreeHugger Robot
b195c402f3
Merge "Re enable remove button after cancel" into qt-dev
2019-05-16 00:51:26 +00:00
Xin Li
f8a2db708b
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
...
am: e6eeb7bd55
2019-05-15 17:38:54 -07:00
Beverly
52fa75463b
Merge "Always include uid as part of recentApp key" into qt-dev
...
am: 08ef7bd52b
2019-05-15 17:32:04 -07:00
Kevin Chyn
e70836257c
Merge "Update enroll to match mocks" into qt-dev
...
am: dbe4384909
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
2019-05-15 17:27:22 -07:00
Lei Yu
c48d4d2f28
Merge "Add empty check for path in UsageGraph" into qt-dev
...
am: 825ac6e370
2019-05-15 16:51:42 -07:00
