Steve Elliott
|
491869e75e
|
Merge "Add entry point to global actions panel settings" into qt-dev am: 4b5d31fe67 am: 3a1573b19d
am: 2d54a75e9a
Change-Id: If6a98382a3f442cf9308e8c4823e937392e4804d
|
2019-05-24 16:52:14 -07:00 |
|
Bill Yi
|
6ae893f436
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours am: 3c1ce4f32d -s ours
am: 8ca592e6cc -s ours
am skip reason: subject contains skip directive
Change-Id: Id8a51338ea18c04046435cc6a6c1972fd4bb6c1e
|
2019-05-24 16:51:54 -07:00 |
|
Pasty Chang
|
24abada3b1
|
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev am: 57ac23b2e5 am: a9d7d4fa9a
am: 10c14115fc
Change-Id: Ia608db48795d9a81017931088d87813ddfdfe000
|
2019-05-24 16:51:42 -07:00 |
|
Arc Wang
|
cc75d0e2d9
|
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c am: 3e39f94880
am: 842b421420
Change-Id: I1dba808a58d55e72259a048d6cb760fe286df054
|
2019-05-24 16:51:24 -07:00 |
|
Yiwen Chen
|
7ef0b0e68c
|
Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a am: 7176ddc247
am: 2dd7a569bb
Change-Id: I936201ef995eeb7d68d559898f74a0f8db848d5b
|
2019-05-24 16:51:09 -07:00 |
|
Beverly
|
289ae65a27
|
Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8 am: 3f5d795953
am: 6cc9f36ba9
Change-Id: Icd9bada3252ca291af3070fffc31efea79f44cc5
|
2019-05-24 16:50:57 -07:00 |
|
Yi Jiang
|
6da0447068
|
Fix unexpected grey-out in Screen attention
Fix preference controller searchable issue.
Bug: 132821023
Bug: 133255690
Test: atest AdaptiveSleepPreferenceControllerTest
Change-Id: I686ed827fbe572c9d8bcde2d8a8e00f2dcb5a6a8
|
2019-05-24 16:50:18 -07:00 |
|
Steve Elliott
|
edf253fef6
|
Merge "Add entry point to global actions panel settings" into qt-dev am: 4b5d31fe67 am: d5c5c8ab9f
am: b136e0a5ce
Change-Id: I2ffbf354700bd1f638226dd2c7713e8f27210fd5
|
2019-05-24 16:50:16 -07:00 |
|
Joshua Mccloskey
|
3c4c3a4783
|
Merge "Added different button for non SUW enrollment" into qt-r1-dev am: d9db8cb608
am: a26dd34be7
Change-Id: I17425b4585c99fdff8f790056b7f1ce536ee0c5b
|
2019-05-24 16:43:10 -07:00 |
|
Lei Yu
|
5e7306963c
|
Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1 am: a444fd99be
am: d0dbb6cb07
Change-Id: Ie484c75b3f1604b30de6d2303a9dccee52a457f8
|
2019-05-24 16:42:54 -07:00 |
|
Varun Shah
|
ad1fa75f8a
|
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d am: 8fa5f72067
am: f62fe1e817
Change-Id: I5771538c91711af7b3432c740f4c81f104b619b5
|
2019-05-24 16:42:38 -07:00 |
|
Lei Yu
|
73039e0cbc
|
Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1 am: 52c51fd26f
am: b46410688f
Change-Id: If4638ce9bf53d839bb5c489a740372a538a41ca3
|
2019-05-24 16:42:23 -07:00 |
|
Varun Shah
|
783985296f
|
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d am: dfdac2d9e0
am: b4432823ee
Change-Id: I331c704139f2c50a1310c88d00683edf92d494d7
|
2019-05-24 16:42:10 -07:00 |
|
Evan Laird
|
a0017cc2f3
|
Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9 am: 81141a5918
am: 7bb5801f29
Change-Id: Ia5a113cb66a855357c57f1015afef8abb57867c0
|
2019-05-24 16:41:53 -07:00 |
|
Evan Laird
|
cf0aed22e3
|
Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9 am: 2915d75658
am: f1c7caf747
Change-Id: Id04b755f78309391ce5400c3734ac76f683671b2
|
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
Change-Id: I4a01c202b1b881b7ac1a01863e3ebdae05ec10f3
|
2019-05-24 16:41:23 -07:00 |
|
Joshua Mccloskey
|
087858b75c
|
Merge "Fixed accessibility size" into qt-r1-dev am: 3c58799231
am: 906f81dc68
Change-Id: I29adc68730da7e49e02fc6760c45fe583cb428fa
|
2019-05-24 16:41:06 -07:00 |
|
Steve Elliott
|
c4a10afc91
|
Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9 am: 61d2a1ae90
am: ff20c817a1
Change-Id: I6da4b16aea9dafbd49a85b89018c90b9a23cbded
|
2019-05-24 16:40:31 -07:00 |
|
Mady Mellor
|
e35007a7d3
|
Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2 am: f4845105b9
am: 84312783c8
Change-Id: I991decc021911c506c74cc257d251905846fd103
|
2019-05-24 16:40:14 -07:00 |
|
Mady Mellor
|
69a9940a0b
|
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev am: 0b37ea8b6d am: 179e585d36
am: e61cba9679
Change-Id: Idd54ddc2a1cc68e3d33a09db4d0a8c6ed8d270b0
|
2019-05-24 16:39:55 -07:00 |
|
tmfang
|
2de8bf3cd3
|
Merge "Fix overlapping problem on wifi detail screen" into qt-dev am: f59844570e am: b50bdf2c13
am: 7b38f84b34
Change-Id: Iae29f7e9ab873b17f8e7826d1d706b3fda062de7
|
2019-05-24 16:39:36 -07:00 |
|
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 |
|