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
Lei Yu
2bdf358cd1
Merge "Hide network select in some situations" into qt-dev
2019-05-23 20:28:38 +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
61d2a1ae90
Merge "Remove info footer in global actions panel settings" into qt-dev
...
am: b731f4d5b9
Change-Id: Id4f69f671aaff77325d1ad2e9fd915388f9a9fe0
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
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
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
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
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
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
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
lindatseng
b4896bd5a8
Merge "Add null check to precent crash in monkey test" into qt-dev
...
am: 99162f2a35
Change-Id: Id155b36402780be4d81289a47a01835e61fe2cb4
2019-05-22 15:18:03 -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
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
Julia Reynolds
b30eb884ad
Merge "Config notifs page updates" into qt-dev
...
am: 1c83c08289
Change-Id: I2115f438c9e496118fa3dfc91d98a709a266042d
2019-05-22 14:35:46 -07:00
lindatseng
db7e223ca7
Merge "Always create new task when launching WifiDialogActivity" into qt-dev
...
am: 49776845e5
Change-Id: I3cf675a8f24bc253befee1fd38d72e19f413a21f
2019-05-22 14:18:37 -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
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
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
0d97074f05
Merge "Add a clarifying comment" into qt-dev
...
am: b1e4072518
Change-Id: Ifb435cf5b14dc5eeb0312c6bf9b61d14dba1fb01
2019-05-22 09:16:57 -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
TreeHugger Robot
b1e4072518
Merge "Add a clarifying comment" into qt-dev
2019-05-22 15:08:27 +00:00
pastychang
48082f891a
Apply stencil theme for description textview
...
Fingerprint enrolling page has a fixed description id. Another
description textview should use setup lib API to apply stencil theme.
Bug: 132366547
Test: Manual
Change-Id: Ifa664b84718ecd211f4c8ff1542ce38c2ef6481b
2019-05-22 13:29:39 +00:00
Mill Chen
94004b05f3
Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev
...
am: ef0f8a4dab
Change-Id: I51bb74cb9aecd04ba0767195386efa7aa58eec2a
2019-05-22 05:29:49 -07:00
Mill Chen
89f32ab8c2
Merge "Revert "Update dialog background color for dark theme"" into qt-dev
...
am: 69faee7358
Change-Id: I373877f3005b62b42b6f3aac35d3f7589357ccc0
2019-05-22 05:17:21 -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
Shuo Qian
8ea9013963
Merge "Add AutoCancel Notification UI for sim change" into qt-dev
...
am: 2d2b224a09
Change-Id: I67b9ffb34f832949778ae35bb14c6f7a00ce472c
2019-05-22 03:31:29 -07:00
Sorin Dinu
326e64ac76
Merge "New icons for partial system update tile which is listed in the Security Status category." into qt-dev
...
am: bab0f4c098
Change-Id: I59c16ed37a9a2ea38851943a4b016ec3bbbe02b5
2019-05-22 02:45:10 -07: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
Salvador Martinez
bea52066c5
Merge "Add metrics stuff for dark ui dialog fragment" into qt-dev
...
am: d680ea2620
Change-Id: I20543c66144bb3a6f7b003965e01cccdf49556f2
2019-05-22 00:58:18 -07: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
Lei Yu
cdc93c6cc3
Merge "Set some BT icon background to white" into qt-dev
...
am: 6cb224b38b
Change-Id: Ic354f9f86268010f8ca379b598ffbc8f1342266a
2019-05-22 00:56:40 -07:00