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
Evan Laird
472e19eae4
Simplify channel importance settings screen
...
Back to bell icons, and removed the flavor text
Test: visual
Bug: 132971502
Change-Id: I55ce6dd07404aed2ceb5423796b733a70c3bfa13
2019-05-24 09:08:14 -04:00
Arc Wang
842b421420
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c
...
am: 3e39f94880
Change-Id: I53350e526743e3fb4597eabe04af9ec54f74a0e2
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
Change-Id: Ib04c4b59431a55a445167bcb8aa7de9812d03d21
2019-05-23 22:57:19 -07:00
Arc Wang
55f4c5eb65
Merge "Fix Wi-Fi QR code decode fail" into qt-dev
...
am: 27d09aeb0c
Change-Id: I9345c2aa577871b3c3fc22ac6960708dac268f5c
2019-05-23 22:19:45 -07:00
Yiwen Chen
b11ec2c1a3
Merge "Keep consistency between sound and accessibility settings." into qt-dev
...
am: 6843e0247a
Change-Id: I8df347b5fba7b83de67f4bf71123cd64026b4587
2019-05-23 22:18:09 -07:00
Arc Wang
535e72a45b
Refactor NotifyOpenNetworksPreferenceControllerTest into TogglePreferenceController
...
NotifyOpenNetworksPreferenceControllerTest is essentially reimplementing TogglePreferenceController.
Add below 2 changes for test failure of CodeInspectionTest
1. Remove some arguments from constructor of the controller
2. Declare the controller in xml instead of in code
Bug: 132391311
Test: manual
NotifyOpenNetworksPreferenceControllerTestTest
Change-Id: Icda870ef0b90aacbacfe588b23d1b28d2b60941c
2019-05-24 12:17:32 +08:00
Arc Wang
912f3558df
Refactor UseOpenWifiPreferenceController into TogglePreferenceController
...
UseOpenWifiPreferenceController is essentially reimplementing TogglePreferenceController.
Add below 2 changes for test failure of CodeInspectionTest
1. Remove some arguments from constructor of the controller
2. Declare the controller in xml instead of in code
Bug: 132391311
Test: manual
UseOpenWifiPreferenceControllerTest
Change-Id: Ie52e79fd0bc66a227bd46f09c74d1fbec614f636
2019-05-24 12:09:20 +08:00
Arc Wang
1ee4adf321
Refactor WifiWakeupPreferenceController into TogglePreferenceController
...
WifiWakeupPreferenceController is essentially reimplementing TogglePreferenceController.
Add below 2 changes for test failure of CodeInspectionTest
1. Remove some arguments from constructor of the controller
2. Declare the controller in xml instead of in code
Bug: 132391311
Test: manual
WifiWakeupPreferenceControllerTest
Change-Id: I4aa607f78d5e7de70600a410dfc7267e6bd7d387
2019-05-24 12:05:37 +08: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
Change-Id: I884be341b204703fcd11a4617bcfba5bdc248231
2019-05-23 15:49:16 -07:00
Lei Yu
a444fd99be
Merge "Hide network select in some situations" into qt-dev
...
am: 2bdf358cd1
Change-Id: Ie188d11a05692d49e8fb154e348aa1789098a0c9
2019-05-23 13:59:54 -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
Change-Id: I1939a419fccc83943f4297595d1400378017ccba
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
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
Stanley Wang
09dbc29187
Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3
...
am: 69893f95ae
Change-Id: Ib454a3aec4c5d3e6ca4de21973723ba667f8a857
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
Change-Id: I8d50f937f42aa6110731eb529a4d468bb7344fdf
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
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
Julia Reynolds
7528ab396e
Merge "Config notifs page updates" into qt-dev am: 1c83c08289
...
am: 4679c46a8a
Change-Id: Iad70e94b3fa7bc65826c755ece8772b6a4c7e0d2
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
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
Antony Sargent
db9abe8dd8
Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev am: e959c201ce
...
am: ce8495d632
Change-Id: If27659f370ed97e07ad024d125ae56b0f4a9efb4
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
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
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
Julia Reynolds
85a3096214
Merge "Fix hiding of channel fields" into qt-dev am: c14825c93d
...
am: b1ec5751c1
Change-Id: I94345bc22e12357a79739cb12fe72067e03d8ba8
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
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
Raff Tsai
59f0a82dc2
Merge "Make SeekBarPreference to be selectable" into qt-dev am: dd59f1193f
...
am: 574893b860
Change-Id: I7761ee743a356507feff41c5554927c3ad61a815
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
Change-Id: Ia9a653d6ce5c6a9164d044e7860e866a76817ee9
2019-05-21 12:20:01 -07:00