Commit Graph

52660 Commits

Author SHA1 Message Date
Lei Yu
d0dbb6cb07 Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1
am: a444fd99be

Change-Id: I33ac534904a87d230b778a2611fea8656cdb0adf
2019-05-23 17:35:10 -07:00
Varun Shah
f62fe1e817 Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d
am: 8fa5f72067

Change-Id: I9bb768d40abe1b5b794ff3f4cb200c0ce018e699
2019-05-23 17:24:30 -07:00
Lei Yu
b46410688f Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1
am: 52c51fd26f

Change-Id: I884be341b204703fcd11a4617bcfba5bdc248231
2019-05-23 15:49:16 -07:00
Varun Shah
b4432823ee Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d
am: dfdac2d9e0

Change-Id: Ibe5d8454e2bf7a8baa5abf17336db3bfa2db7517
2019-05-23 15:37:05 -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
7bb5801f29 Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9
am: 81141a5918

Change-Id: I3200b84d7fe61ae9f5fe2831e2445325f2311640
2019-05-23 14:05:19 -07:00
Evan Laird
f1c7caf747 Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9
am: 2915d75658

Change-Id: I3eb6858274aab0eea0b57e54170ab51d07ec726a
2019-05-23 14:02:43 -07:00
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
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
Joshua Mccloskey
0e568fbb1a Merge "Reduced time to 3 seconds." into qt-r1-dev
am: da74cc8cc7

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

Change-Id: I7461e660212d8752d2399bb89998dd004de839a4
2019-05-23 13:25:30 -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
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

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

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

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

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

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
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
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
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
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