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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
08ef7bd52b
Merge "Always include uid as part of recentApp key" into qt-dev
2019-05-15 22:47:28 +00: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
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
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
Colin Cross
e43660a00d
Merge "Convert Settings to Android.bp" into qt-dev-plus-aosp
...
am: a7125ade35
Change-Id: I7627072b9a64c6713acc657e47a7755dca7383f9
2019-05-14 17:58:41 -07:00
Colin Cross
a7125ade35
Merge "Convert Settings to Android.bp" into qt-dev-plus-aosp
2019-05-14 23:33:31 +00:00
Salvador Martinez
ee5f79edbd
Fix dark theme and battery saver interaction
...
In settings we weren't properly taking into account battery saver
enabled dark theme. This CL makes it so that when battery saver
on we disable the toggle until battery saver is off since
you can't change dark theme in battery saver. Additionally it
adds a message indicating why the toggle was disabled so the
user doesn't get confused.
Test: robotests
Bug: 131913864
Change-Id: I855e429a666098c837650852d1e1355477afa13d
2019-05-14 14:08:24 -07:00
Cn Chen
b5b3699f4c
Merge "Font size page support light theme in deferred setup" into qt-dev
...
am: 421a05a6a9
Change-Id: I3646918b1c52d2962ef736699c2198be0f42613f
2019-05-14 00:32:35 -07:00
Cn Chen
421a05a6a9
Merge "Font size page support light theme in deferred setup" into qt-dev
2019-05-14 07:18:03 +00:00
cnchen
3eee5cf02e
Font size page support light theme in deferred setup
...
Bug:124470158
Test: atest & manually test
Change-Id: I41e1e98a9a64e516a294c4a94c8b5f335434078f
Merged-In: I41e1e98a9a64e516a294c4a94c8b5f335434078f
2019-05-14 14:01:14 +08:00
Cn Chen
1062d3376d
Merge "Font size page support light theme in deferred setup."
2019-05-14 05:55:09 +00:00
Jason Chiu
1568c82bc9
Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev am: 8bc21da216
...
am: 28d513fc32
Change-Id: I58d2b2a50eda5155bb70810325897a46c916e14a
2019-05-13 22:17:11 -07:00
Jason Chiu
28d513fc32
Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev
...
am: 8bc21da216
Change-Id: Ibc6bbef7f4f257cb0a144daaff0774b088392784
2019-05-13 22:14:04 -07:00
TreeHugger Robot
8bc21da216
Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev
2019-05-14 04:44:27 +00:00
Andy Chou
1a48e4cf9b
Merge "Fix IMEI information can't display without pSIM inserted" into qt-dev am: e553afa7f3
...
am: 761dc8cc6e
Change-Id: Ibd6aee1d1f8e85676df911c3f0ac247e09f0dd8a
2019-05-13 21:12:36 -07:00
Andy Chou
761dc8cc6e
Merge "Fix IMEI information can't display without pSIM inserted" into qt-dev
...
am: e553afa7f3
Change-Id: I669384cfa38e376d0783015285a5cebc1397b8c2
2019-05-13 20:53:09 -07:00
Andy Chou
e553afa7f3
Merge "Fix IMEI information can't display without pSIM inserted" into qt-dev
2019-05-14 03:32:26 +00:00
Mehdi Alizadeh
5da39b16b7
Merge "Refactors the System Navigation settings page" into qt-dev am: e575fc44f5
...
am: e53b5845b9
Change-Id: Ie33befe3f79bf5a6e79a8fd2e9df32f96e9f1b97
2019-05-13 18:44:32 -07:00
Lei Yu
83db3dc80d
Merge "Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL" into qt-dev am: 1ffae41f4e
...
am: cdd91541c1
Change-Id: Ie96e8da080476bb698dfc80f59787ee188716b96
2019-05-13 18:31:24 -07:00
Mehdi Alizadeh
e53b5845b9
Merge "Refactors the System Navigation settings page" into qt-dev
...
am: e575fc44f5
Change-Id: I6e308e2b0bd2e1c6c8cc0dd55f184480e4b2145c
2019-05-13 18:22:43 -07:00
Mehdi Alizadeh
e575fc44f5
Merge "Refactors the System Navigation settings page" into qt-dev
2019-05-14 01:08:22 +00:00
Lei Yu
cdd91541c1
Merge "Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL" into qt-dev
...
am: 1ffae41f4e
Change-Id: I483907ea77225c8962977d53b9709d681dbf3ac3
2019-05-13 18:05:08 -07:00
cnchen
7a83d51a6b
Font size page support light theme in deferred setup.
...
Bug:124470158
Test: atest & manually test
Change-Id: I41e1e98a9a64e516a294c4a94c8b5f335434078f
2019-05-14 09:04:29 +08:00
TreeHugger Robot
1ffae41f4e
Merge "Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL" into qt-dev
2019-05-14 00:54:58 +00:00
Raff Tsai
c74dcafb6c
Merge "Fix robolectric test error" into qt-dev
...
am: 3f845f8dd9
Change-Id: I7d9420e1558aa0ea5d19cb5c00c25357c2abc1b4
2019-05-13 17:22:08 -07:00
Raff Tsai
9c115f3f08
Fix robolectric test error
...
Fixes: 132575837
Test: make RunSettingsRoboTests
Change-Id: I5238a3789f5308a489298fadae772b8b9343ddb5
Merged-In: I5238a3789f5308a489298fadae772b8b9343ddb5
(cherry picked from commit 3c337d5659
)
2019-05-13 23:02:30 +00:00
Lei Yu
85398a503e
Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL
...
If it is true, then hide:
1. Network Select settings
2. Apn settings
Fixes: 131709441
Test: RunSettingsRoboTests
Change-Id: I203cda570564a41c5bb54a3ad9e60c7f35c0d30c
2019-05-13 15:56:17 -07:00
Mehdi Alizadeh
36f32a46ca
Refactors the System Navigation settings page
...
Bug: 130915285
Bug: 128855215
Bug: 127718810
Bug: 129115299
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Change-Id: If11e1fe4bf150d2dd9578f731e71abf6b74f5d90
2019-05-13 14:31:20 -07:00
Colin Cross
946a0fd964
Convert Settings to Android.bp
...
See build/soong/README.md for more information.
Test: m checkbuild
Test: m RunSettingsRoboTests-jacoco
Change-Id: I267534c095c30833f77273dbdb1893b7830ed45d
2019-05-13 13:42:01 -07:00
Jason Chiu
4af092ac88
Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev am: 6a3eb31763
...
am: 90cb5628bb
Change-Id: I80d9d96d1be2fa871d1320e29f3c3cb380676d42
2019-05-13 12:34:36 -07:00
Jason Chiu
90cb5628bb
Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev
...
am: 6a3eb31763
Change-Id: I40edb775bb09083110767745728356aa7c639d47
2019-05-13 12:05:11 -07:00
Mady Mellor
47aad1c655
Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev am: 240b227e1f
...
am: 34fa757cc9
Change-Id: I01aa071f1ce7f59aa160b7e53baf9da2d2a7db95
2019-05-13 11:59:52 -07:00