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
Badhri Jagan Sridharan
bf5686e5f5
Help URI for USB contaminant dialog
...
Bug: 132737150
Test: build test.
Change-Id: If6ac3b086edaee18cd982ef12220b480d12f5228
2019-05-16 18:08:37 -07: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
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
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
Pavel Grafov
72b85a3798
Merge "Make credential confirmation activity resizeable." into qt-dev
...
am: e455680bd2
Change-Id: I48363a2d8d7cb20144ff1bba003b8b37ebf1944b
2019-05-16 05:26:22 -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
Mill Chen
77259dc9bb
Revert "Update dialog background color for dark theme"
...
This reverts commit 3032628269
.
Reason for revert: This will also change the background color of other components within dialog.
Bug: 132753127
Bug: 132623454
Test: visual
Change-Id: I59d4731e84e8d516a01780c4cce70b2d86208098
2019-05-16 14:46:52 +08:00
Kevin Chyn
931b2dbf09
Merge "Update footer buttons depending on entry point" into qt-dev
...
am: 7411ce155d
Change-Id: I70f6b8d6551af985d36b628fbab4218cec1f34c9
2019-05-15 19:01:31 -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 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
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib2112047ef62fa9e995a97bcf0a0e19f61cdea76
2019-05-15 17:38:54 -07: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
Xin Li
87f090ba57
DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
...
Bug: 132622481
Change-Id: I3f8a777574eb05716d4ff18e64c9750184de26b6
2019-05-15 16:55:39 -07:00
Lei Yu
c48d4d2f28
Merge "Add empty check for path in UsageGraph" into qt-dev
...
am: 825ac6e370
Change-Id: Ic29926ea84ec4be6f2200eaa34103c618a65727e
2019-05-15 16:51:42 -07:00
Fan Zhang
2fef4914b2
Merge "Fix preview image alignment issue due to clip padding." into qt-dev
...
am: 0376a3ce13
Change-Id: I39f1a49aaaf698358fca54e69fb6beb65d452a22
2019-05-15 16:41:39 -07:00
TreeHugger Robot
08ef7bd52b
Merge "Always include uid as part of recentApp key" into qt-dev
2019-05-15 22:47:28 +00:00
Kevin Chyn
dbe4384909
Merge "Update enroll to match mocks" into qt-dev
2019-05-15 22:34:40 +00:00
Mehdi Alizadeh
a4803f3634
Merge "Replace system navigation animations will smaller files" into qt-dev
...
am: b9cb4ab062
Change-Id: If9f5e6e3023224af6592f6bff91f3838e7ee3ca1
2019-05-15 15:31:05 -07:00
Lei Yu
825ac6e370
Merge "Add empty check for path in UsageGraph" into qt-dev
2019-05-15 22:05:18 +00:00
TreeHugger Robot
0376a3ce13
Merge "Fix preview image alignment issue due to clip padding." into qt-dev
2019-05-15 22:01:06 +00:00
TreeHugger Robot
b9cb4ab062
Merge "Replace system navigation animations will smaller files" into qt-dev
2019-05-15 21:17:13 +00:00
Fan Zhang
db3fca16f7
Fix preview image alignment issue due to clip padding.
...
CaptionPropertiesFragment is using a non-standard way to display preview
images. Changed to use LayoutPreference.
Bug: 132797057
Test: visual
Change-Id: I92bfd38e2880226d7385e98ed871dad4e1f30e42
2019-05-15 13:26:39 -07:00
Kevin Chyn
ceb5aa4514
Update enroll to match mocks
...
Test: manual
Fixes: 132803438
Change-Id: I99a10e60833a31b71abf8fdbf7e426e9867a1cf5
2019-05-15 12:51:13 -07:00
joshmccloskey
77735226a8
Re enable remove button after cancel
...
Fixes: 132753128
Test: Manual.
Change-Id: I36ef74455dc8ceca52dfbc8d0e6fbef770b2533d
2019-05-15 12:44:14 -07:00
Beverly
10d8894686
Always include uid as part of recentApp key
...
- so that work apps are also tracked
Test: atest RecentNotifyingAppsPreferenceControllerTest
Fixes: 132183578
Change-Id: Iceb9604674a3525b93c1cdde6e32a3a83b813866
2019-05-15 14:46:35 -04:00
Lei Yu
7db71f91bf
Add empty check for path in UsageGraph
...
If path is empty, skip method since there is nothing to draw.
Bug: 132728523
Test: RunSettingsRoboTests
Change-Id: I6fdb7c2f69d3d658c47b58c7304cfeb7d4010a46
2019-05-15 11:36:15 -07:00
Mehdi Alizadeh
001fb53530
Replace system navigation animations will smaller files
...
Bug: 130915285
Test: Manual test
Change-Id: I902177c5f5c0d56f463fbc4e9532c70581fe9154
2019-05-15 11:05:12 -07:00
Alexey Kuzmin
1c5017c5fc
Play vibration preview when turning on vibration
...
Bug: 130332550
Test: Go to Settings > Accessibility > Vibration. Set vibration strength
to some value, then set it to off, then set it back to the previous
value. The vibration preview should be played
Change-Id: Ie28efe01fc4df5356cc0d316c1a88e518f81df41
2019-05-15 17:03:48 +01:00
Alexey Kuzmin
63e3779701
Fix usage hint of ringtone vibration preview
...
Bug: 130332550
Test: Go to Settings > Accessibility > Vibration > Notification
vibration, set it to off. Go to Settings > Accessibility > Vibration >
Ring vibration, and switch it a couple times. The preview effect should
be played
Change-Id: Ida4f04bb92873120c0f958d298ec31c8fb5dab97
2019-05-15 14:56:16 +01:00
Pavel Grafov
973c5e5bf3
Make credential confirmation activity resizeable.
...
This prevents it from breaking split-screen mode.
Test: manual
Bug: 129045018
Change-Id: I380a9a51dbfb0e44f8d9800ae521584b13d0cc3f
2019-05-15 11:16:31 +01:00
Sorin Dinu
bfb45b6177
Merge "Added icons for partial system update card in the Security category" into qt-dev
...
am: 2e26605065
Change-Id: I64cd2ebce05b77718b0ba8aa3cd6f7c69c1d0768
2019-05-14 23:53:19 -07:00
Sorin Dinu
2e26605065
Merge "Added icons for partial system update card in the Security category" into qt-dev
2019-05-15 06:31:49 +00:00
Kevin Chang
bfed5d1ca1
Merge "Change string of switchbar and installed service category title" into qt-dev
...
am: d0c5f2d443
Change-Id: I4e8f59bd9c5d0a9b906b4b0bbc05446dc24156ad
2019-05-14 19:50:05 -07:00
Kevin Chang
d0c5f2d443
Merge "Change string of switchbar and installed service category title" into qt-dev
2019-05-15 02:13:09 +00:00
Salvador Martinez
db30782bbf
Merge "Fix dark theme and battery saver interaction" into qt-dev
...
am: ba5964d99d
Change-Id: I83ee0c60e08af8f2166eb3f01a30baa975a86600
2019-05-14 19:12:12 -07:00
Salvador Martinez
ba5964d99d
Merge "Fix dark theme and battery saver interaction" into qt-dev
2019-05-15 01:33:08 +00:00
Kevin Chang
5111c50977
Fix no reaction when tapping permission dialog button in shortcut service page
...
Bug: 132579785
Test: Visual
Change-Id: If9102228439ce23bdfb925baf6f583bb9d4d550d
2019-05-15 09:07:22 +08:00