Commit Graph

54778 Commits

Author SHA1 Message Date
Steve Elliott
a818dd47ca Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9 am: fba21ebbd2
am: f3a074d3b4

Change-Id: I523c8051375fcbaaf545e51f0feeab8548c83e62
2019-05-24 16:37:15 -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

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

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
Julia Reynolds
9b6dd07073 Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217
am: f6578fc088

Change-Id: I9cae221ff76a5e41d0bbd1843ebd474793069e37
2019-05-24 16:25:26 -07:00
Bill Yi
5100cabd86 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I85ca3c33f3b5db38609634d9a711db9612584567
2019-05-24 14:40:18 -07:00
Julia Reynolds
c0b1bf6abb Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217
am: c70cdc69b5

Change-Id: I119e6b4b56cdbd8b9cd15cc970f103bf20a6e930
2019-05-24 11:50:29 -07:00
Evan Laird
e04352c32e Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff
am: 1e3eb21b0d

Change-Id: Ie3ecd4a9675d009efe86f9f282eb4fe05f3c8717
2019-05-24 11:28:07 -07:00
Evan Laird
22a6050035 Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff
am: a433064df4

Change-Id: I547d4346aea58b8a2fa1e9a3470ac4877f73ed68
2019-05-24 11:23:24 -07:00
Julia Reynolds
f6578fc088 Merge "Allow the default SMS app to be blocked" into qt-dev
am: aaecede217

Change-Id: I0d29112d331f9bb4fb59ad40931c77701982e915
2019-05-24 10:16:01 -07:00
Julia Reynolds
c70cdc69b5 Merge "Allow the default SMS app to be blocked" into qt-dev
am: aaecede217

Change-Id: I0169d6fece78c05431a691d6b94033ed1da97978
2019-05-24 10:13:57 -07:00
Evan Laird
a433064df4 Merge "Simplify channel importance settings screen" into qt-dev
am: 4321e038ff

Change-Id: I9346139116adef62b83e1e85030c8371fa936375
2019-05-24 10:13:47 -07:00
Evan Laird
1e3eb21b0d Merge "Simplify channel importance settings screen" into qt-dev
am: 4321e038ff

Change-Id: I016269c4608af821497f262223cd7f0f62f8c5f5
2019-05-24 10:11:04 -07:00
Julia Reynolds
aaecede217 Merge "Allow the default SMS app to be blocked" into qt-dev 2019-05-24 17:00:12 +00:00
TreeHugger Robot
4321e038ff Merge "Simplify channel importance settings screen" into qt-dev 2019-05-24 16:36:49 +00:00
tmfang
a00e725b0a Tweak title for "App content"
Test: visual
Bug: 133370964
Change-Id: I6351df67164b35dc1299aa5a57ab10325af575de
2019-05-25 00:24:02 +08:00
Arc Wang
d7ece7edc9 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5
am: 96a7bcafb6

Change-Id: I082c8b8197adb02f7fa857df06ebf35ba38b97cc
2019-05-24 08:04:36 -07:00
Arc Wang
edd3b8dbaa Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5
am: f7db4e4cc6

Change-Id: I639d27195b04d2ac4cf97f338d8802b24a45b474
2019-05-24 07:57:32 -07:00
Arc Wang
96a7bcafb6 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev
am: 7d7353c3b5

Change-Id: Ia366acf4c94763fa4836fe2d98c7b4e0abc86ac8
2019-05-24 07:52:31 -07:00
Arc Wang
f7db4e4cc6 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev
am: 7d7353c3b5

Change-Id: Ib254eb2406ed0e90fc5a278755f9c087bfdde493
2019-05-24 07:52:08 -07:00
Arc Wang
7d7353c3b5 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev 2019-05-24 14:36:44 +00: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
Evan Laird
472e19eae4 Simplify channel importance settings screen
Back to bell icons, and removed the flavor text

Test: visual
Bug: 132971502
Change-Id: I55ce6dd07404aed2ceb5423796b733a70c3bfa13
2019-05-24 09:08:14 -04:00
tmfang
3f0d6ece74 Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61
am: 81c7772d3d

Change-Id: Ifa561bf7f344e6c42f441222b49ed05213626123
2019-05-24 03:25:45 -07:00
Bill Yi
5e371d6051 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours
am: 704789a5d5 -s ours
am skip reason: subject contains skip directive

Change-Id: I04af1fa805919d6b97c47feb49f0ba8e356e01ae
2019-05-24 02:50:54 -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
Pasty Chang
8638c5f02b Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev am: 57ac23b2e5
am: 20cd84ebe6

Change-Id: I9568ec5483e9b5ffe4f6f9b7c64c13c164ca2247
2019-05-24 02:13:54 -07:00
tmfang
ee4ca732ef Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61
am: 848ead645b

Change-Id: If3b73c2f521282f83f6e9aa53fcf671bb9bedadb
2019-05-24 01:17:19 -07:00