Steve Elliott
3a1573b19d
Merge "Add entry point to global actions panel settings" into qt-dev
...
am: 4b5d31fe67
Change-Id: I113dd052dbf86f2d7053ac90ca86fcf7b86adf23
2019-05-23 22:13:59 -07:00
Steve Elliott
d5c5c8ab9f
Merge "Add entry point to global actions panel settings" into qt-dev
...
am: 4b5d31fe67
Change-Id: Ia1df945feebe39f875a041d243e26abaf6c41fe2
2019-05-23 22:09:49 -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
Joshua Mccloskey
d9db8cb608
Merge "Added different button for non SUW enrollment" into qt-r1-dev
2019-05-24 02:36:54 +00: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
TreeHugger Robot
d5daa47be8
Merge "Add ability to adjust height of VideoPreference" into qt-dev
2019-05-24 01:19:59 +00:00
TreeHugger Robot
4b5d31fe67
Merge "Add entry point to global actions panel settings" into qt-dev
2019-05-24 01:14:40 +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
Varun Shah
b4432823ee
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d
...
am: dfdac2d9e0
Change-Id: Ibe5d8454e2bf7a8baa5abf17336db3bfa2db7517
2019-05-23 15:37:05 -07:00
Lei Yu
52c51fd26f
Merge "Hide network select in some situations" into qt-dev
...
am: 2bdf358cd1
Change-Id: I9266a78be96e48d68cce94969601735013a021c7
2019-05-23 14:38:47 -07:00
Varun Shah
dfdac2d9e0
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev
...
am: 4e27d29e6d
Change-Id: I25af902f0a0f94faa8f89edf85a6657c11d6ea9d
2019-05-23 14:21:17 -07:00
Evan Laird
f1c7caf747
Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9
...
am: 2915d75658
Change-Id: I3eb6858274aab0eea0b57e54170ab51d07ec726a
2019-05-23 14:02:43 -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
Varun Shah
8fa5f72067
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev
...
am: 4e27d29e6d
Change-Id: I3c868ab4d881c1866a334420fc5bdf8efdea4af9
2019-05-23 13:53:07 -07:00
Evan Laird
2915d75658
Merge "Remove gentle/alerting icons from channel settings" into qt-dev
...
am: 535f0489c9
Change-Id: I72d23c40798d3098391f51bd5f8c750cbaf97569
2019-05-23 13:38:03 -07:00
Evan Laird
81141a5918
Merge "Remove gentle/alerting icons from channel settings" into qt-dev
...
am: 535f0489c9
Change-Id: I6925501e09124c1b6907f599254db0ea7adbc4ac
2019-05-23 13:36:17 -07:00
Joshua Mccloskey
0e568fbb1a
Merge "Reduced time to 3 seconds." into qt-r1-dev
...
am: da74cc8cc7
Change-Id: I91b7948e9efc55a9a5d4e6234cc384dd4df786be
2019-05-23 13:34:53 -07:00
Lei Yu
2bdf358cd1
Merge "Hide network select in some situations" into qt-dev
2019-05-23 20:28:38 +00:00
joshmccloskey
cf8e9af588
Added different button for non SUW enrollment
...
Bug: 133416320
Test: Manual.
Change-Id: I7087d5d4aa8f41e8d357f6fb41774d1bc62c17d9
2019-05-23 13:19:00 -07:00
Joshua Mccloskey
da74cc8cc7
Merge "Reduced time to 3 seconds." into qt-r1-dev
2019-05-23 19:44:31 +00:00
TreeHugger Robot
4e27d29e6d
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev
2019-05-23 19:17:27 +00:00
TreeHugger Robot
535f0489c9
Merge "Remove gentle/alerting icons from channel settings" into qt-dev
2019-05-23 18:17:46 +00:00
Julia Reynolds
e6ad9d98e2
Allow the default SMS app to be blocked
...
Test: manual
Fixes: 133413626
Change-Id: Iebbba87e31bb3126da179c140eef42311b0be33e
2019-05-23 14:04:18 -04: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
Mady Mellor
f0da39b736
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev am: 0b37ea8b6d
...
am: 03e5e847f7
Change-Id: Ia51e59cccfe66bba4b636a0ebad757b24b64f8b6
2019-05-23 08:06:18 -07:00
tmfang
cb2f916eac
Merge "Fix overlapping problem on wifi detail screen" into qt-dev am: f59844570e
...
am: 9b9359547c
Change-Id: Iea192e4d92c2c3e7c903dd99f2b06a8258d3af50
2019-05-23 08:05:21 -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
179e585d36
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev
...
am: 0b37ea8b6d
Change-Id: I5b2295d59d00b9df0fa93a3d300baa8975994678
2019-05-23 07:44:07 -07:00
tmfang
b50bdf2c13
Merge "Fix overlapping problem on wifi detail screen" into qt-dev
...
am: f59844570e
Change-Id: Ic7723df5c956208c71945dc2c0008fe4872a529b
2019-05-23 07:43:09 -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
Mady Mellor
0b37ea8b6d
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev
2019-05-23 13:58:00 +00:00
TreeHugger Robot
f59844570e
Merge "Fix overlapping problem on wifi detail screen" into qt-dev
2019-05-23 13:13:48 +00:00
Amin Shaikh
083478ff01
Remove theming developer settings.
...
Fixes: 133222035
Test: mp settingsg; open developer options
Change-Id: Ide1573466dfab4bc116e14df1b23d129a4c5a176
2019-05-23 08:54:02 -04: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
Beverly
2f41418c0d
Add ability to adjust height of VideoPreference
...
Test: manual
Bug: 132108705
Change-Id: I3b2172764908f408ba96bc6ef6dc0305f4dabd28
2019-05-23 11:53:35 +00: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
pastychang
2cb81f9a2b
Fix fingerprint enrolling in settings show heavy theme
...
The descrpiton textview of fingerprint enrolling page that launchs from
settings shouldn't apply heavy theme. It must check the atrribute of
heavy theme is true first, and then apply it.
Bug: 132366547
Test: Manual
Change-Id: Id52151b308fa80f84a67d132634a8e9c58291878
2019-05-23 15:42:41 +08:00
tmfang
2ff083c2f1
Fix overlapping problem on wifi detail screen
...
If we didn't set view and lifecycle for EntityHeaderController,
it only sets "z-order" as 0 for action bar.
So, user sees overlapped problem while user is scrolling view.
For now, we set view and lifecycle as parameter for EntityHeaderController,
then EntityHeaderController can change "z-order" while scrolling view.
Test: visual and robo test
Fixes: 133380109
Change-Id: I0445c6aeaa42d798374d2c712e9611a09a6b55e7
2019-05-23 15:27:14 +08: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
Pasty Chang
1b4965583f
Merge "Apply stencil theme for description textview" into qt-dev
...
am: 6746e15859
Change-Id: I942536c27482caa9a119103b65e0c66c3366364a
2019-05-22 21:14:23 -07:00