Evan Laird
cf0aed22e3
Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9 am: 2915d75658
...
am: f1c7caf747
2019-05-24 16:41:37 -07:00
Joshua Mccloskey
f5857f907f
Merge "Reduced time to 3 seconds." into qt-r1-dev am: da74cc8cc7
...
am: 0e568fbb1a
2019-05-24 16:41:23 -07:00
Mady Mellor
1fa11a8c37
Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2 am: 4740a76fd4
...
am: 34c7eac424
2019-05-24 16:36:57 -07:00
Mady Mellor
b63290ea2e
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev am: 0b37ea8b6d am: 03e5e847f7
...
am: f0da39b736
2019-05-24 16:36:39 -07:00
tmfang
28e0a07e45
Merge "Fix overlapping problem on wifi detail screen" into qt-dev am: f59844570e am: 9b9359547c
...
am: cb2f916eac
2019-05-24 16:36:07 -07:00
Alan Stokes
81ddb45922
Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d am: 5b1b45b498
...
am: 9a17e6265a
2019-05-24 06:50:21 -07:00
Stanley Wang
69f6d559b0
Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3 am: 69893f95ae
...
am: 09dbc29187
2019-05-24 06:48:04 -07:00
Pasty Chang
ecbc4e524f
Merge "Apply stencil theme for description textview" into qt-dev am: 6746e15859 am: 1b4965583f
...
am: 7fef0c3b9b
2019-05-24 06:46:08 -07:00
Lei Yu
f945851e79
Merge "Update logic to build slider slice" into qt-dev am: 8866301b83 am: 1131a1e0d7
...
am: fc58ee09fb
2019-05-24 06:44:06 -07:00
lindatseng
fa23a8b1f2
Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35 am: b84816d05b
...
am: e204110910
2019-05-24 06:39:30 -07:00
Julia Reynolds
642f5aeee8
Merge "Config notifs page updates" into qt-dev am: 1c83c08289 am: 4679c46a8a
...
am: 7528ab396e
2019-05-24 06:38:22 -07:00
Alexey Kuzmin
584613d784
Merge "Add a clarifying comment" into qt-dev am: b1e4072518 am: 0d97074f05
...
am: 4fc9f55bc2
2019-05-24 06:35:22 -07:00
Mill Chen
2321b1037f
Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev am: ef0f8a4dab am: 388cca892a
...
am: fa23fcc795
2019-05-24 06:30:15 -07:00
Shuo Qian
0da520c161
Merge "Add AutoCancel Notification UI for sim change" into qt-dev am: 2d2b224a09 am: 89f9e91075
...
am: e73593af34
2019-05-24 02:35:00 -07:00
Evan Laird
f1c7caf747
Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9
...
am: 2915d75658
2019-05-23 14:02:43 -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
Joshua Mccloskey
0e568fbb1a
Merge "Reduced time to 3 seconds." into qt-r1-dev
...
am: da74cc8cc7
2019-05-23 13:34:53 -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
535f0489c9
Merge "Remove gentle/alerting icons from channel settings" into qt-dev
2019-05-23 18:17:46 +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
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
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
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
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
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
2019-05-22 21:14:23 -07:00
Lei Yu
1131a1e0d7
Merge "Update logic to build slider slice" into qt-dev
...
am: 8866301b83
2019-05-22 21:10:11 -07:00
Salvador Martinez
f60a153dba
Merge "Add metrics stuff for dark ui dialog fragment" into qt-dev am: d680ea2620 am: cfb9b61a6e
...
am: db06238cc2
2019-05-22 20:37:10 -07:00
Antony Sargent
389e2a0a97
Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev am: e959c201ce am: ce8495d632
...
am: db9abe8dd8
2019-05-22 20:36:05 -07: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
Julia Reynolds
cba0b335c5
Merge "Fix hiding of channel fields" into qt-dev am: c14825c93d am: b1ec5751c1
...
am: 85a3096214
2019-05-22 16:31:19 -07:00
lindatseng
e204110910
Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35
...
am: b84816d05b
2019-05-22 15:24:54 -07: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
2019-05-22 15:18:03 -07:00
Julia Reynolds
7528ab396e
Merge "Config notifs page updates" into qt-dev am: 1c83c08289
...
am: 4679c46a8a
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
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
