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
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
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
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
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
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
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
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
Kevin Chang
556422915d
Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443
...
am: bfed5d1ca1
Change-Id: Ic897066e6b9989ff68b5e6b3b2cb2f5ffe56cea9
2019-05-14 20:24:53 -07:00
Salvador Martinez
1e1b7fb99c
Merge "Fix dark theme and battery saver interaction" into qt-dev am: ba5964d99d
...
am: db30782bbf
Change-Id: I5d379c04ac030f60fb6dff117adca529661cd9c2
2019-05-14 19:52:22 -07: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
Lei Yu
f84633ec79
Merge "Use NetworkTemplate to query data" into qt-dev am: 6b2030a17a
...
am: 6d260e680f
Change-Id: I0be1829d75cee480df6c86d11909e0c8e7fcb082
2019-05-14 18:47:51 -07:00
Salvador Martinez
ba5964d99d
Merge "Fix dark theme and battery saver interaction" into qt-dev
2019-05-15 01:33:08 +00:00
Fan Zhang
ff8a733f63
Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev am: 17521d0ac7
...
am: d32e9b5229
Change-Id: Icf5c8c48bb2ea7375cc03d3cec9d9879b6db7249
2019-05-14 18:15:28 -07: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
Lei Yu
6d260e680f
Merge "Use NetworkTemplate to query data" into qt-dev
...
am: 6b2030a17a
Change-Id: Ib3599b9c6c8500be35454de89c882c47c3d20721
2019-05-14 17:52:06 -07:00
Fan Zhang
d32e9b5229
Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev
...
am: 17521d0ac7
Change-Id: Id702a72ce6adc1dbb20c4f00c0b16cf1ff5ef603
2019-05-14 17:41:06 -07:00