Salvador Martinez
a7fba3efe2
Merge "Break infinite refresh loop in battery estimates" into qt-dev
...
am: e418874921
Change-Id: I05f1402b1510a3008ef0e5beac4262762b9dbc1c
2019-05-20 16:05:21 -07:00
Salvador Martinez
e418874921
Merge "Break infinite refresh loop in battery estimates" into qt-dev
2019-05-20 21:22:23 +00:00
Narayan Kamath
c756190b9c
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev
...
am: 76cf0dbddd
Change-Id: Ic097d7c264bbc198c0ef3c0ed9099beb9339a2e0
2019-05-20 05:14:33 -07:00
Narayan Kamath
76cf0dbddd
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev
2019-05-20 07:42:53 +00: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
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
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
Salvador Martinez
12731cce3d
Break infinite refresh loop in battery estimates
...
There was an infinite loop that could occur in BatterySaverUtils
what was caused by battery saver utils updating the battery estimate
which then told the page to check for an estimate and then it would
repeat from there. This cleans up the logic in that loop slightly
to prevent it from refreshing more than is necessary.
Test: atest BatteryUtilsTest
Bug: 132751712
Change-Id: I918484747ecd9735315570ad608489e0f61d7578
2019-05-17 15:36:55 -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
Narayan Kamath
67d149ae37
Hide AppButtonsPreferenceController for system modules.
...
Bug: 131927465
Test: atest AppButtonsPreferenceControllerTest
Change-Id: I2d3aa3429f61325afe49bfe322522fe9ccd03b2c
2019-05-17 18:54:39 +01: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
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
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
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
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
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
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
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
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