Steve Elliott
f3a074d3b4
Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9
...
am: fba21ebbd2
Change-Id: I2706d002c8af41c411643fe851ef844c5f9d935a
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
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
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
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
Alan Stokes
95213d9886
Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d
...
am: 6646a8ce58
Change-Id: Icb1269f9b27e17443c16f5908f81cdb93e8952aa
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
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
Alan Stokes
9a17e6265a
Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d
...
am: 5b1b45b498
Change-Id: Idb41bf428a0e25c26a1e3369fd4400b640c65f53
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
Change-Id: Ie79c6afd36d6b1b28f72cb437a32733b2e3ad2c1
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
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
Pasty Chang
4797b3e6a1
Merge "Apply stencil theme for description textview" into qt-dev am: 6746e15859
...
am: 3c859e38e4
Change-Id: Ib41991dd21a8a464a164ed98f73e61368b327ba2
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
Change-Id: I40bc435b5fb582f4a8013d030cc40b99a520035c
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
Change-Id: I45204d51554ae1866db7535716a73dcde03dac6a
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
Change-Id: I91ed5c8cf732fef7b0d8167b62ca465c09746eaa
2019-05-23 00:50:55 -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
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
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
lindatseng
64d202bdee
Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35
...
am: b4896bd5a8
Change-Id: I78041e68615a928a240c962ef85024eb4e253802
2019-05-22 20:05:44 -07:00
Julia Reynolds
5a4d7bda5a
Merge "Config notifs page updates" into qt-dev am: 1c83c08289
...
am: b30eb884ad
Change-Id: I56b160193fe9a16d9f345a49a283f2b59ad2c8f3
2019-05-22 19:50:05 -07:00
lindatseng
50559c6fde
Merge "Always create new task when launching WifiDialogActivity" into qt-dev am: 49776845e5
...
am: db7e223ca7
Change-Id: Ic2ab44b8610afde7186187d38884cfc3bb31bba7
2019-05-22 19:35:53 -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
joshmccloskey
b8eb0031d4
Merge "Updated spacing" into qt-r1-dev
...
am: bbdf816d5f
Change-Id: I5d6a1db2247cef097cf08f3f4ee7ffac91c4a7e1
2019-05-22 17:12:31 -07:00
lindatseng
e204110910
Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35
...
am: b84816d05b
Change-Id: I999d335a653e461ec140f87bbfa4c936ca7e5a59
2019-05-22 15:24:54 -07:00
TreeHugger Robot
bbdf816d5f
Merge "Updated spacing" into qt-r1-dev
2019-05-22 22:20:49 +00: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
Julia Reynolds
7528ab396e
Merge "Config notifs page updates" into qt-dev am: 1c83c08289
...
am: 4679c46a8a
Change-Id: Iad70e94b3fa7bc65826c755ece8772b6a4c7e0d2
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
lindatseng
775f9c577a
Merge "Always create new task when launching WifiDialogActivity" into qt-dev am: 49776845e5
...
am: 0146947e25
Change-Id: Id90a1df176c33a2b97adfe78b42284ff9d43e32c
2019-05-22 14:58:15 -07:00
Alexey Kuzmin
024b216dc5
Merge "Add a clarifying comment" into qt-dev am: b1e4072518
...
am: 0d87841f11
Change-Id: Ifb70935753af7002befae7d893771c251180e1a6
2019-05-22 14:45:25 -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
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