Varun Shah
8fa5f72067
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev
...
am: 4e27d29e6d
2019-05-23 13:53:07 -07:00
Evan Laird
2915d75658
Merge "Remove gentle/alerting icons from channel settings" into qt-dev
...
am: 535f0489c9
2019-05-23 13:38:03 -07:00
Evan Laird
81141a5918
Merge "Remove gentle/alerting icons from channel settings" into qt-dev
...
am: 535f0489c9
2019-05-23 13:36:17 -07:00
Joshua Mccloskey
0e568fbb1a
Merge "Reduced time to 3 seconds." into qt-r1-dev
...
am: da74cc8cc7
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
Joshua Mccloskey
906f81dc68
Merge "Fixed accessibility size" into qt-r1-dev
...
am: 3c58799231
2019-05-23 13:25:30 -07: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
Joshua Mccloskey
3c58799231
Merge "Fixed accessibility size" into qt-r1-dev
2019-05-23 19:44:06 +00:00
joshmccloskey
2c6300a207
Fixed accessibility size
...
Test: Verified icon appeared larger.
Fixes: 133367596
Change-Id: Ic2fa956d2c2ce420a320abaa629a1ab3a2fbef5a
2019-05-23 19:43:55 +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
Steve Elliott
ff20c817a1
Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9
...
am: 61d2a1ae90
2019-05-23 09:14:38 -07:00
Mady Mellor
84312783c8
Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2
...
am: f4845105b9
2019-05-23 09:13:42 -07:00
Mady Mellor
e61cba9679
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev am: 0b37ea8b6d
...
am: 179e585d36
2019-05-23 09:11:11 -07:00
tmfang
7b38f84b34
Merge "Fix overlapping problem on wifi detail screen" into qt-dev am: f59844570e
...
am: b50bdf2c13
2019-05-23 08:57:27 -07:00
Steve Elliott
f3a074d3b4
Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9
...
am: fba21ebbd2
2019-05-23 08:52:45 -07:00
Steve Elliott
fba21ebbd2
Merge "Remove info footer in global actions panel settings" into qt-dev
...
am: b731f4d5b9
2019-05-23 08:39:46 -07:00
Steve Elliott
61d2a1ae90
Merge "Remove info footer in global actions panel settings" into qt-dev
...
am: b731f4d5b9
2019-05-23 08:38:00 -07:00
Steve Elliott
b731f4d5b9
Merge "Remove info footer in global actions panel settings" into qt-dev
2019-05-23 15:25:40 +00: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
Mady Mellor
f0da39b736
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev am: 0b37ea8b6d
...
am: 03e5e847f7
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
2019-05-23 08:05:21 -07:00
Mady Mellor
f4845105b9
Merge "App Bubble control page should always be available, even if off globally" into qt-dev
...
am: f7f1dd37c2
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
2019-05-23 07:44:07 -07:00
tmfang
b50bdf2c13
Merge "Fix overlapping problem on wifi detail screen" into qt-dev
...
am: f59844570e
2019-05-23 07:43:09 -07:00
Mady Mellor
4740a76fd4
Merge "App Bubble control page should always be available, even if off globally" into qt-dev
...
am: f7f1dd37c2
2019-05-23 07:30:30 -07:00
Mady Mellor
03e5e847f7
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev
...
am: 0b37ea8b6d
2019-05-23 07:29:44 -07:00
tmfang
9b9359547c
Merge "Fix overlapping problem on wifi detail screen" into qt-dev
...
am: f59844570e
2019-05-23 07:28: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
Mady Mellor
0b37ea8b6d
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev
2019-05-23 13:58:00 +00:00
Alan Stokes
95213d9886
Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d
...
am: 6646a8ce58
2019-05-23 06:21:30 -07: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
Alan Stokes
6646a8ce58
Merge "Background activity starts are now blocked by default." into qt-dev
...
am: 3178ea5f2d
2019-05-23 05:13:54 -07: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
9a17e6265a
Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d
...
am: 5b1b45b498
2019-05-23 04:11:14 -07:00
Stanley Wang
50aa76adfd
Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3
...
am: 68ce56b016
2019-05-23 04:01:32 -07: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
Pasty Chang
4797b3e6a1
Merge "Apply stencil theme for description textview" into qt-dev am: 6746e15859
...
am: 3c859e38e4
2019-05-23 01:39:33 -07:00
Pasty Chang
7fef0c3b9b
Merge "Apply stencil theme for description textview" into qt-dev am: 6746e15859
...
am: 1b4965583f
2019-05-23 01:34:21 -07:00
Lei Yu
6adc5f2c25
Merge "Update logic to build slider slice" into qt-dev am: 8866301b83
...
am: 6d4f03d915
2019-05-23 01:27:33 -07:00
Lei Yu
fc58ee09fb
Merge "Update logic to build slider slice" into qt-dev am: 8866301b83
...
am: 1131a1e0d7
2019-05-23 00:50:55 -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
