Arc Wang
cc75d0e2d9
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c am: 3e39f94880
...
am: 842b421420
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
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
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
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
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
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
2019-05-24 06:38:22 -07:00
Arc Wang
842b421420
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c
...
am: 3e39f94880
2019-05-23 23:15:05 -07:00
Yiwen Chen
2dd7a569bb
Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a
...
am: 7176ddc247
2019-05-23 22:57:19 -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
b46410688f
Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1
...
am: 52c51fd26f
2019-05-23 15:49:16 -07: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
Mady Mellor
34c7eac424
Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2
...
am: 4740a76fd4
2019-05-23 08:07:12 -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
Alan Stokes
5b1b45b498
Merge "Background activity starts are now blocked by default." into qt-dev
...
am: 3178ea5f2d
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
2019-05-23 02:04:24 -07:00
Stanley Wang
09dbc29187
Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3
...
am: 69893f95ae
2019-05-23 01:48:00 -07: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
Lei Yu
1131a1e0d7
Merge "Update logic to build slider slice" into qt-dev
...
am: 8866301b83
2019-05-22 21:10:11 -07:00
Antony Sargent
389e2a0a97
Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev am: e959c201ce am: ce8495d632
...
am: db9abe8dd8
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
2019-05-22 16:31:19 -07:00
Julia Reynolds
7528ab396e
Merge "Config notifs page updates" into qt-dev am: 1c83c08289
...
am: 4679c46a8a
2019-05-22 15:13:32 -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
Julia Reynolds
b30eb884ad
Merge "Config notifs page updates" into qt-dev
...
am: 1c83c08289
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
Antony Sargent
db9abe8dd8
Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev am: e959c201ce
...
am: ce8495d632
2019-05-22 05:17:34 -07: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
2019-05-22 00:57:19 -07:00
Julia Reynolds
8d3520eafd
Merge "Fix hiding of channel fields" into qt-dev
...
am: c14825c93d
2019-05-22 00:55:59 -07:00
Raff Tsai
ddae587bde
Merge "Make SeekBarPreference to be selectable" into qt-dev
...
am: dd59f1193f
2019-05-21 23:57:52 -07:00
Raff Tsai
2db569e7ee
Merge "Make SeekBarPreference to be selectable" into qt-dev am: dd59f1193f am: 574893b860
...
am: 59f0a82dc2
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
2019-05-21 21:21:32 -07:00
Julia Reynolds
85a3096214
Merge "Fix hiding of channel fields" into qt-dev am: c14825c93d
...
am: b1ec5751c1
2019-05-21 17:30:09 -07:00
Alex Kershaw
2209a704c3
Merge "Don't display footer text when calling app is DPC." into qt-dev
...
am: 993446a68e
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
Raff Tsai
59f0a82dc2
Merge "Make SeekBarPreference to be selectable" into qt-dev am: dd59f1193f
...
am: 574893b860
2019-05-21 12:22:42 -07:00
Alex Kershaw
0f9426a8b5
Merge "Don't display footer text when calling app is DPC." into qt-dev am: 993446a68e
...
am: e19ede22a2
2019-05-21 12:20:01 -07: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
