Commit Graph

7322 Commits

Author SHA1 Message Date
Arc Wang
cc75d0e2d9 Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c am: 3e39f94880
am: 842b421420

Change-Id: I1dba808a58d55e72259a048d6cb760fe286df054
2019-05-24 16:51:24 -07:00
Lei Yu
73039e0cbc Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1 am: 52c51fd26f
am: b46410688f

Change-Id: If4638ce9bf53d839bb5c489a740372a538a41ca3
2019-05-24 16:42:23 -07:00
Mady Mellor
1fa11a8c37 Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2 am: 4740a76fd4
am: 34c7eac424

Change-Id: I64398601c3d1f37a124c04f4e042a34ae1c45673
2019-05-24 16:36:57 -07:00
Alan Stokes
81ddb45922 Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d am: 5b1b45b498
am: 9a17e6265a

Change-Id: I24459012f6a6a0b4e3265d36423bed9cafa20d3e
2019-05-24 06:50:21 -07:00
Stanley Wang
69f6d559b0 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3 am: 69893f95ae
am: 09dbc29187

Change-Id: I94a03587188d833536b13627776ba9c44af77492
2019-05-24 06:48:04 -07:00
Lei Yu
f945851e79 Merge "Update logic to build slider slice" into qt-dev am: 8866301b83 am: 1131a1e0d7
am: fc58ee09fb

Change-Id: I5f9cafd727000d9e9042aa2075ad05b235d33aff
2019-05-24 06:44:06 -07:00
Julia Reynolds
642f5aeee8 Merge "Config notifs page updates" into qt-dev am: 1c83c08289 am: 4679c46a8a
am: 7528ab396e

Change-Id: Iecf21ae784fcf82b31a7ccbf4fe52e8950709996
2019-05-24 06:38:22 -07:00
Arc Wang
27d09aeb0c Merge "Fix Wi-Fi QR code decode fail" into qt-dev 2019-05-24 01:56:42 +00:00
Yiwen Chen
6843e0247a Merge "Keep consistency between sound and accessibility settings." into qt-dev 2019-05-24 01:24:52 +00:00
Yiwen Chen
85580fbc88 Keep consistency between sound and accessibility settings.
Bug: 130741987
Test: Tested on device
Change-Id: Id6dd485c73f9453970b8d79929ffc04acb2c76c8
(cherry picked from commit 494071463b)
2019-05-24 01:24:35 +00:00
Lei Yu
2bdf358cd1 Merge "Hide network select in some situations" into qt-dev 2019-05-23 20:28:38 +00:00
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
Yiwen Chen
cbb6ea5ea4 Merge "Keep consistency between sound and accessibility settings." 2019-05-23 14:52:48 +00: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
TreeHugger Robot
3178ea5f2d Merge "Background activity starts are now blocked by default." into qt-dev 2019-05-23 09:43:27 +00:00
Yiwen Chen
494071463b Keep consistency between sound and accessibility settings.
Bug: 130741987
Test: Tested on device
Change-Id: Id6dd485c73f9453970b8d79929ffc04acb2c76c8
2019-05-23 00:13:01 -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
Antony Sargent
389e2a0a97 Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev am: e959c201ce am: ce8495d632
am: db9abe8dd8

Change-Id: Ibde17a1d7949d24b5861db8172a3313dda054c7b
2019-05-22 20:36:05 -07:00
TreeHugger Robot
8866301b83 Merge "Update logic to build slider slice" into qt-dev 2019-05-23 00:39:10 +00:00
Julia Reynolds
cba0b335c5 Merge "Fix hiding of channel fields" into qt-dev am: c14825c93d am: b1ec5751c1
am: 85a3096214

Change-Id: I0c5fc03a217e489cd1eec5022ecb42ace7390a0a
2019-05-22 16:31:19 -07: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
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
Raff Tsai
2db569e7ee Merge "Make SeekBarPreference to be selectable" into qt-dev am: dd59f1193f am: 574893b860
am: 59f0a82dc2

Change-Id: I4c099e731976d4020879e7ec6fe093f50a164dce
2019-05-21 21:24:27 -07:00
Alex Kershaw
5e8053e4fe Merge "Don't display footer text when calling app is DPC." into qt-dev am: 993446a68e am: e19ede22a2
am: 0f9426a8b5

Change-Id: I99302c800a78cc570c137e9a2df0b9a7621a6f4f
2019-05-21 21:21:32 -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
TreeHugger Robot
546a06af3d Merge "[Wi-Fi DPP] Refine Wi-Fi DPP UI layouts with SUW library" 2019-05-21 09:56:05 +00:00
Arc Wang
8e3c49123d [Wi-Fi DPP] Refine Wi-Fi DPP UI layouts with SUW library
1. Use GlifLayout in all fragments
2. Fragments use 32dp icon instead of 48 dp
3. Replace ScrollView & ProgressBar & Header & Footer of original layout with GlifLayout design
4. Remove ActionBar (no more back button on screen top)

Bug: 129021867
Test: manual
Change-Id: I2fda48cb7f7819b2c8dd85c10d39e1f187463bd8
2019-05-21 13:59:39 +08: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
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
76cf0dbddd Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev 2019-05-20 07:42:53 +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
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
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
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
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