Commit Graph

8615 Commits

Author SHA1 Message Date
Lei Yu
2bf8806740 Hide network select in some situations
Hide network select when:
1. NETWORK_MODE_LTE_CDMA_EVDO && worldMode
2. 6 NETWORK_MODE && worldMode && !Tdscdma

Also update GSM/CDMA check since it was only include 1 network mode,
not 6 modes.

Fixes: 131126607
Test: RunSettingsRoboTests
Change-Id: I28782778827ced7d9f24d527d52399e2b544109e
2019-05-23 09:56:28 -07:00
Mady Mellor
f4845105b9 Merge "App Bubble control page should always be available, even if off globally" into qt-dev
am: f7f1dd37c2

Change-Id: Iae957998688392d32cfb693a32d02353ffa39bbd
2019-05-23 07:44:58 -07:00
Mady Mellor
f7f1dd37c2 Merge "App Bubble control page should always be available, even if off globally" into qt-dev 2019-05-23 13:58:19 +00:00
Arc Wang
0d706f0047 Fix Wi-Fi QR code decode fail
ZXing generate QR code with default encoding ISO-8859-1,
the generated QR code is wrong encoded if there is a
character outside of the charset.

Generate QR code of UTF-8 encoding.

Bug: 131851854
Test: manual
Change-Id: I96a5e72a978c654b62d89b3b11dd3016bf0ee1df
2019-05-23 20:41:45 +08:00
Alan Stokes
5b1b45b498 Merge "Background activity starts are now blocked by default." into qt-dev
am: 3178ea5f2d

Change-Id: I98a1e7b51f56acb15d4f7118bced2e20d8a7f152
2019-05-23 03:11:59 -07:00
TreeHugger Robot
3178ea5f2d Merge "Background activity starts are now blocked by default." into qt-dev 2019-05-23 09:43:27 +00:00
Stanley Wang
68ce56b016 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev
am: 3da9f727e3

Change-Id: I3b33d3cf0509d3c1091dfcfc39df00bbb1441933
2019-05-23 02:04:24 -07:00
TreeHugger Robot
3da9f727e3 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev 2019-05-23 04:19:27 +00:00
Lei Yu
1131a1e0d7 Merge "Update logic to build slider slice" into qt-dev
am: 8866301b83

Change-Id: I8d50f937f42aa6110731eb529a4d468bb7344fdf
2019-05-22 21:10:11 -07:00
TreeHugger Robot
8866301b83 Merge "Update logic to build slider slice" into qt-dev 2019-05-23 00:39:10 +00:00
Mady Mellor
2c960fca1a App Bubble control page should always be available, even if off globally
There is API to open up the app-specific bubble page, therefor, we should
always show the toggle. The previous work to move bubbles to developer
settings broke this.

This CL adds a param to the controller to note whether it's the app
specific page or not (since controller is also used for channel settings)
to enable this behaviour.

Added a test for this situation.

Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER=Bubble
Bug: 131846917
Change-Id: I72b1f4b5b033d1b24281061cfa6bed4d734dfcb1
2019-05-22 15:04:31 -07:00
Julia Reynolds
b30eb884ad Merge "Config notifs page updates" into qt-dev
am: 1c83c08289

Change-Id: I2115f438c9e496118fa3dfc91d98a709a266042d
2019-05-22 14:35:46 -07:00
Lei Yu
2837d010ad Update logic to build slider slice
Return null when slider getMax() <= getMin(), instead of force
build it to make it crash

Fixes: 132657278
Test: RunSettingsRoboTests
Change-Id: I9f3c078ae07522aa8f1cebdee3f73df2d014d6bb
2019-05-22 14:13:09 -07:00
TreeHugger Robot
1c83c08289 Merge "Config notifs page updates" into qt-dev 2019-05-22 17:30:30 +00:00
Julia Reynolds
4fe79c266e Config notifs page updates
- Remove unused settings
- Regroup and combine lockscreen settings. The original
lockscreen controller is used in other places (SUW and privacy)
and so it's left untouched for those uses for now.

Test: atest
Bug: 132971502
Change-Id: Ic82817ff98cab27ca35b9488ae2e0eb6922a18e8
2019-05-22 12:00:49 -04:00
Alan Stokes
303c31f492 Background activity starts are now blocked by default.
Change the default for "Allow background activity starts" to off,
matching the logic in the activity manager.

Bug: 129955487
Bug: 129533810
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=AllowBackgroundActivityStartsPreferenceControllerTest

Change-Id: If9eeae699f9c8b7913da4456a45286f816cc7463
2019-05-22 12:55:16 +01:00
Stanley Wang
ae78184c5f Fix Settings crashing while displaying phone number slice.
Check if the SubscriptionInfo list is empty to avoid the IndexOutOfBoundsException.

Fixes: 133258244
Test: maunal & robotest

Change-Id: I837f6761ba2b53823f0126f734f65875a30e34dd
2019-05-22 16:50:52 +08:00
Antony Sargent
bf5f0e77b4 Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev
am: e959c201ce

Change-Id: I8992b985d6d58e23e1d566e08f07808e60438288
2019-05-22 00:57:19 -07:00
Julia Reynolds
8d3520eafd Merge "Fix hiding of channel fields" into qt-dev
am: c14825c93d

Change-Id: Iac8ac8a6322872a3d77738b95a465ec39e144cab
2019-05-22 00:55:59 -07:00
Raff Tsai
ddae587bde Merge "Make SeekBarPreference to be selectable" into qt-dev
am: dd59f1193f

Change-Id: I89748794f2ebb28296347039de9e357808fe5b2f
2019-05-21 23:57:52 -07:00
Alex Kershaw
2209a704c3 Merge "Don't display footer text when calling app is DPC." into qt-dev
am: 993446a68e

Change-Id: Ibeb049f0779435427a252d2e640b24b9e80c026e
2019-05-21 14:40:51 -07:00
TreeHugger Robot
e959c201ce Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev 2019-05-21 20:34:13 +00:00
Antony Sargent
5c46d93bd8 Prevent NullPointerException in SimStatusDialogController
In rare cases the SignalStrength we get for a SIM can be null, which
wasn't checked for in this code. This CL adds a null check and fixes the
tests so it's possible to verify the fix (one of the methods that would
have crashed was being spy'd over unnecessarily).

Fixes: 132570076
Test: make RunSettingsRobotests
Change-Id: Ifdec24f184ee2d93e5e242eb2c20695249992fc6
2019-05-21 10:02:10 -07:00
TreeHugger Robot
c14825c93d Merge "Fix hiding of channel fields" into qt-dev 2019-05-21 16:58:23 +00:00
TreeHugger Robot
dd59f1193f Merge "Make SeekBarPreference to be selectable" into qt-dev 2019-05-21 10:28:28 +00:00
Raff Tsai
81b9f5083d Make SeekBarPreference to be selectable
Fixes: 132983200
Test: make RunSettingsRoboTests, manual
Change-Id: I3d4bc59d948236ff2482945a4fc976ee61c37c27
2019-05-21 11:39:02 +08:00
TreeHugger Robot
993446a68e Merge "Don't display footer text when calling app is DPC." into qt-dev 2019-05-21 01:24:19 +00:00
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
Julia Reynolds
72bdef0781 Fix hiding of channel fields
When channel is off

Test: atest
Bug: 132971502
Change-Id: I5772266e022e5ebb5dbf20f231ca30fad95e3db7
2019-05-20 14:03:07 -04:00
Alex Kershaw
29d2bff7e1 Don't display footer text when calling app is DPC.
If the calling app has admin rights (DA/DO/PO), don't display footer
text that the calling app is 'recommending' that a password is set.

Fixes: 131888973
Test: atest com.android.settings.password.SetNewPasswordActivityTest --verbose
Test: atest com.android.settings.password.ChooseLockGenericTest --verbose
Test: manual
Change-Id: I32785d33e6425416fc1dbba24540ece8917b58f3
2019-05-20 12:19:22 +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
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
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
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
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
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