Commit Graph

53254 Commits

Author SHA1 Message Date
Mady Mellor
b63290ea2e Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev am: 0b37ea8b6d am: 03e5e847f7
am: f0da39b736

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

Change-Id: Ic3fe2bf224bd09b7c3b1bdc66badea1adee6ab02
2019-05-24 16:36:07 -07:00
Alan Stokes
c7cf1e4089 Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d am: 6646a8ce58
am: 95213d9886

Change-Id: Ie79f15001e2f53fcbe20b829c6de670eafed6a1f
2019-05-24 06:58:28 -07:00
Alan Stokes
81ddb45922 Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d am: 5b1b45b498
am: 9a17e6265a

Change-Id: I24459012f6a6a0b4e3265d36423bed9cafa20d3e
2019-05-24 06:50:21 -07:00
Stanley Wang
ea6f691731 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3 am: 68ce56b016
am: 50aa76adfd

Change-Id: Iaa06bf2918091cf0ca1015faff26677d342ca41a
2019-05-24 06:49:00 -07:00
Stanley Wang
69f6d559b0 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3 am: 69893f95ae
am: 09dbc29187

Change-Id: I94a03587188d833536b13627776ba9c44af77492
2019-05-24 06:48:04 -07:00
Pasty Chang
55c78bec0b Merge "Apply stencil theme for description textview" into qt-dev am: 6746e15859 am: 3c859e38e4
am: 4797b3e6a1

Change-Id: I2eca288c3fdf6c2cf074f6fe1978f8b41d04c9e8
2019-05-24 06:47:06 -07:00
Pasty Chang
ecbc4e524f Merge "Apply stencil theme for description textview" into qt-dev am: 6746e15859 am: 1b4965583f
am: 7fef0c3b9b

Change-Id: I8becd16e32705caa22335a17321661e45942a4bc
2019-05-24 06:46:08 -07:00
Lei Yu
5e044596fa Merge "Update logic to build slider slice" into qt-dev am: 8866301b83 am: 6d4f03d915
am: 6adc5f2c25

Change-Id: Id65e4b6e467ffc5a34c2414cb673854e9acfbd6e
2019-05-24 06:45:11 -07:00
Lei Yu
f945851e79 Merge "Update logic to build slider slice" into qt-dev am: 8866301b83 am: 1131a1e0d7
am: fc58ee09fb

Change-Id: I5f9cafd727000d9e9042aa2075ad05b235d33aff
2019-05-24 06:44:06 -07:00
lindatseng
feb231fdec Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35 am: b4896bd5a8
am: 64d202bdee

Change-Id: Ie6586ff3f36366677185e81da2b3e58674a71df9
2019-05-24 06:43:07 -07:00
Julia Reynolds
2732ac7c5e Merge "Config notifs page updates" into qt-dev am: 1c83c08289 am: b30eb884ad
am: 5a4d7bda5a

Change-Id: I01bfc9dbe06ecf03df997b5f4f686b2258edd3dc
2019-05-24 06:42:10 -07:00
lindatseng
e337987e8a Merge "Always create new task when launching WifiDialogActivity" into qt-dev am: 49776845e5 am: db7e223ca7
am: 50559c6fde

Change-Id: Ie95c87a195f8ba47a9134133412559996add5fcf
2019-05-24 06:41:14 -07:00
joshmccloskey
9465225085 Merge "Updated spacing" into qt-r1-dev am: bbdf816d5f
am: b8eb0031d4

Change-Id: I3933f4701ba753c5592d9b723299d76f3d748e2e
2019-05-24 06:40:19 -07:00
lindatseng
fa23a8b1f2 Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35 am: b84816d05b
am: e204110910

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

Change-Id: Iecf21ae784fcf82b31a7ccbf4fe52e8950709996
2019-05-24 06:38:22 -07:00
lindatseng
421c6e9f7b Merge "Always create new task when launching WifiDialogActivity" into qt-dev am: 49776845e5 am: 0146947e25
am: 775f9c577a

Change-Id: I0e0a54c37cbdb314f71cb32d85e06cf2554f873d
2019-05-24 06:37:23 -07:00
Alexey Kuzmin
8c31d58fc2 Merge "Add a clarifying comment" into qt-dev am: b1e4072518 am: 0d87841f11
am: 024b216dc5

Change-Id: I8a63446558ea8b8a76c06c96ffc6c15ccf03ec51
2019-05-24 06:36:23 -07:00
Alexey Kuzmin
584613d784 Merge "Add a clarifying comment" into qt-dev am: b1e4072518 am: 0d97074f05
am: 4fc9f55bc2

Change-Id: I1236739df98e42e6ef91fb3b6d54e9a2b8fe914b
2019-05-24 06:35:22 -07:00
Mill Chen
bbbb4622c3 Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev am: ef0f8a4dab am: 94004b05f3
am: 4a7c513869

Change-Id: I5b2ab05b2b85535ac4edc4d7746c3c8842e78af5
2019-05-24 06:34:16 -07:00
Mill Chen
50141e1cf4 Merge "Revert "Update dialog background color for dark theme"" into qt-dev am: 69faee7358 am: 89f32ab8c2
am: a23d5d917c

Change-Id: I4f9dc81b422a3cb81d2b3e57469a919447e899ff
2019-05-24 06:33:15 -07:00
Shuo Qian
21a8988cea Merge "Add AutoCancel Notification UI for sim change" into qt-dev am: 2d2b224a09 am: 8ea9013963
am: bab2e5239a

Change-Id: Id6dbf67437bfbea69a1fbae3f321e82d12e0a6f5
2019-05-24 06:32:11 -07:00
Sorin Dinu
8cb12ee009 Merge "New icons for partial system update tile which is listed in the Security Status category." into qt-dev am: bab0f4c098 am: 326e64ac76
am: cd11ea4569

Change-Id: I39ae2a7f0f8caecf122ab46e23c8f8503a2774f8
2019-05-24 06:31:13 -07:00
Mill Chen
2321b1037f Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev am: ef0f8a4dab am: 388cca892a
am: fa23fcc795

Change-Id: Ic888037f538b15935e69149d01cfd8fa2eb31dbc
2019-05-24 06:30:15 -07:00
Mill Chen
30298cdd63 Merge "Revert "Update dialog background color for dark theme"" into qt-dev am: 69faee7358 am: ab98f12e68
am: ba572939ba

Change-Id: I87e4da36ac286e8bfeb3c494075909f0e01a9776
2019-05-24 06:29:02 -07:00
Shuo Qian
0da520c161 Merge "Add AutoCancel Notification UI for sim change" into qt-dev am: 2d2b224a09 am: 89f9e91075
am: e73593af34

Change-Id: Ie2e3ec993c13f0daaecca220bb1623037b70fd71
2019-05-24 02:35:00 -07:00
Sorin Dinu
6a87c5c4f5 Merge "New icons for partial system update tile which is listed in the Security Status category." into qt-dev am: bab0f4c098 am: af22e72a77
am: 91c38c41d6

Change-Id: I3861790e3e74e6e6b661820469d68b68ad79f120
2019-05-23 19:32:34 -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
Yiwen Chen
cbb6ea5ea4 Merge "Keep consistency between sound and accessibility settings." 2019-05-23 14:52:48 +00: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
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
Salvador Martinez
5da97ca816 Merge "Add metrics stuff for dark ui dialog fragment" into qt-dev am: d680ea2620 am: bea52066c5
am: 8198de0478

Change-Id: I44ac19146c9cd9d8ff7192b79b03edc6d43cfd8e
2019-05-23 03:06:20 -07:00
Antony Sargent
e3bcf901fc Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev am: e959c201ce am: bf5f0e77b4
am: 170a224a1c

Change-Id: I3031f5f3a2f449a1c932d3b807fc46263cfe6d39
2019-05-23 03:05:03 -07:00
Lei Yu
7a288fc154 Merge "Set some BT icon background to white" into qt-dev am: 6cb224b38b am: cdc93c6cc3
am: 4e5ee0637d

Change-Id: Ifc7dd19bcca29c03826f68eb97ea508d6128ed8a
2019-05-23 03:03:58 -07:00
Julia Reynolds
978c63fe85 Merge "Fix hiding of channel fields" into qt-dev am: c14825c93d am: 8d3520eafd
am: 40c08ef5f7

Change-Id: I461e9fc874b2376b83db13d17fd88c1b6e392dac
2019-05-23 03:02:56 -07:00
Amin Shaikh
26ad481544 Merge "Remove unnecessary STOPSHIP." into qt-dev am: ed3136b72d am: b9e435f95b
am: fd068066d7

Change-Id: I07d6b27eb04500887e57bdeb8a7ba9978e1a2fc7
2019-05-23 03:01:52 -07:00
Antony Sargent
dbe22ecbad Merge "Fix signal strength display in 'Choose network' list" into qt-dev am: 13acaddf47 am: be3dd8b52e
am: f3be588c91

Change-Id: Id3bbb1762c74e4510ff21285cdff93b1d3b2b569
2019-05-23 03:00:48 -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