Commit Graph

51950 Commits

Author SHA1 Message Date
Lei Yu
5f3c55b919 Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1
am: 52c51fd26f

Change-Id: Iff0d26029ec5fe9aef411259d850e88380ef2249
2019-05-23 19:21:34 -07:00
Varun Shah
22c60f7215 Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d
am: dfdac2d9e0

Change-Id: I34ba882d8f707bbf3533510d78ba84934659e623
2019-05-23 19:14:03 -07:00
Evan Laird
3d87119200 Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9
am: 81141a5918

Change-Id: Ifb7c45044437b7a247817fc5ef7f71005b0974d8
2019-05-23 19:06:52 -07:00
Joshua Mccloskey
cffd260ade Merge "Reduced time to 3 seconds." into qt-r1-dev
am: da74cc8cc7

Change-Id: Id1cdecc62c983aa7a21c44021ec8d0953671d330
2019-05-23 18:59:25 -07:00
Joshua Mccloskey
5edf273704 Merge "Fixed accessibility size" into qt-r1-dev
am: 3c58799231

Change-Id: I664291dd29c92a07524be8b8750b45351cac2c5e
2019-05-23 18:52:06 -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
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
Lei Yu
2bdf358cd1 Merge "Hide network select in some situations" into qt-dev 2019-05-23 20:28:38 +00: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
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
fba21ebbd2 Merge "Remove info footer in global actions panel settings" into qt-dev
am: b731f4d5b9

Change-Id: I7890695180fb191d58e5754e5baab032c82964b0
2019-05-23 08:39:46 -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
4740a76fd4 Merge "App Bubble control page should always be available, even if off globally" into qt-dev
am: f7f1dd37c2

Change-Id: I1cf0e56ea78e8792d0b7095789059bd7ebff9cf2
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

Change-Id: I92ad1efd126cb44dbd232c789ceb619b87cd4ed6
2019-05-23 07:29:44 -07:00
tmfang
9b9359547c Merge "Fix overlapping problem on wifi detail screen" into qt-dev
am: f59844570e

Change-Id: Ib86e96feb570bd1ee10791334b790f0e5fec0869
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
TreeHugger Robot
f59844570e Merge "Fix overlapping problem on wifi detail screen" into qt-dev 2019-05-23 13:13:48 +00:00
Alan Stokes
6646a8ce58 Merge "Background activity starts are now blocked by default." into qt-dev
am: 3178ea5f2d

Change-Id: Ica202122fd24816e9252fea12335ae958eaf35ce
2019-05-23 05:13:54 -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
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
Stanley Wang
69893f95ae Merge "Fix Settings crashing while displaying phone number slice." into qt-dev
am: 3da9f727e3

Change-Id: Icc1d2e188c55e1601584025f7e27864e85260487
2019-05-22 22:11:28 -07:00
Pasty Chang
3c859e38e4 Merge "Apply stencil theme for description textview" into qt-dev
am: 6746e15859

Change-Id: I7c12641d7921af25609576a9709b2a39bd7c186a
2019-05-22 22:10:10 -07:00
Lei Yu
6d4f03d915 Merge "Update logic to build slider slice" into qt-dev
am: 8866301b83

Change-Id: Iefcf422a0e337626ae492b54c61be067ebfdb591
2019-05-22 21:52:14 -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
joshmccloskey
f98f6bacf8 Reduced time to 3 seconds.
Test: Manual.
Fixes: 133364918
Change-Id: I1ce38f49a64d7066117cf3f0008a4558983033f2
2019-05-22 19:35:48 -07:00
Pasty Chang
6746e15859 Merge "Apply stencil theme for description textview" into qt-dev 2019-05-23 01:40:14 +00:00
TreeHugger Robot
8866301b83 Merge "Update logic to build slider slice" into qt-dev 2019-05-23 00:39:10 +00:00
Evan Laird
f061ccf14d Remove gentle/alerting icons from channel settings
Don't show the blue/orange gentle/alerting icons in the top-level
notification settings. Just good ol' whitespace.

Bug: 132971502
Test: visual
Change-Id: I63d0f727c9e9a63f888212009b64d89a910b4645
2019-05-22 18:21:18 -04:00
TreeHugger Robot
bbdf816d5f Merge "Updated spacing" into qt-r1-dev 2019-05-22 22:20:49 +00: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
Mady Mellor
ddec88774a Make sure the fragment manager is passed to BubblePreferenceController
This wasn't being set always / at least for the app specific page.
This CL ensures it is & makes it so that there is only 1 constructor.

Fixes: 132864244
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER=Bubble
Change-Id: I9c422e75583b3091d1571cfb8cc43ec49b801599
2019-05-22 15:03:28 -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
joshmccloskey
c71dd8f628 Updated spacing
Test: Manual.
Fixes: 133190719
Change-Id: I1d6b0de2815d03cf6277192fd192cdbedd358dee
2019-05-22 13:35:13 -07:00
lindatseng
b84816d05b Merge "Add null check to precent crash in monkey test" into qt-dev
am: 99162f2a35

Change-Id: I0f97e3b46e081fca41190ba9ea10d839f268511a
2019-05-22 13:22:01 -07:00
Steve Elliott
2c293a2455 Remove info footer in global actions panel settings
Bug: 133332405
Test: manual
Change-Id: I8b7eed5ce3b4b585b0940888ef7c7413617e90dd
2019-05-22 15:38:00 -04:00
TreeHugger Robot
99162f2a35 Merge "Add null check to precent crash in monkey test" into qt-dev 2019-05-22 19:21:37 +00:00
Varun Shah
3e228f5a1a Update design for Family Link supervision enrollment dialog.
Bug: 124066840
Test: manual (trigger dialog via adb shell command)
Change-Id: Iff79a2ed034bb0128ce6c573ceea58c7a9f1c985
2019-05-22 11:48:07 -07:00
Julia Reynolds
4679c46a8a Merge "Config notifs page updates" into qt-dev
am: 1c83c08289

Change-Id: I81339b13cb9cb222e324be4ff55214fc07966376
2019-05-22 11:05:38 -07:00
lindatseng
0146947e25 Merge "Always create new task when launching WifiDialogActivity" into qt-dev
am: 49776845e5

Change-Id: Icefc8ded8ced006f6d3499d8744e83d8a5b00064
2019-05-22 10:58:15 -07:00
lindatseng
be70aaa6c4 Add null check to precent crash in monkey test
Fixes: 133259172
Test: manual
Change-Id: Ib4dd24965fda40a7a917397bf558309e0424bf16
2019-05-22 10:36:50 -07:00
TreeHugger Robot
1c83c08289 Merge "Config notifs page updates" into qt-dev 2019-05-22 17:30:30 +00:00
TreeHugger Robot
49776845e5 Merge "Always create new task when launching WifiDialogActivity" into qt-dev 2019-05-22 17:12:30 +00:00
Alexey Kuzmin
0d87841f11 Merge "Add a clarifying comment" into qt-dev
am: b1e4072518

Change-Id: I7cb1cef1fa78f93478a6dc21b289f34a2458bc23
2019-05-22 09:45:11 -07: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