Yi Jiang
|
c99e853a1b
|
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d am: a4b9203139
am: 648ded3601
Change-Id: I761597ffe33fb5619b18e689028cfc299f3e132a
|
2019-05-24 21:47:12 -07:00 |
|
Bill Yi
|
2a2c2dd9e9
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81 -s ours
am: 3a87453b4b -s ours
am skip reason: subject contains skip directive
Change-Id: Ic86fa0b3e71419f3d1a035635450642540f2a458
|
2019-05-24 21:32:15 -07:00 |
|
Yi Jiang
|
db3457ea42
|
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d
am: 43f82bd3c4
Change-Id: Ifdecffdb5d3a4dcddc3675c18f316ddf0ebb0503
|
2019-05-24 21:22:23 -07:00 |
|
Bill Yi
|
60b0ca2c2a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81 -s ours
am: 793e99ff96 -s ours
am skip reason: subject contains skip directive
Change-Id: I8d283321c5f7f119d5b99d3658929d80fc327e01
|
2019-05-24 21:15:08 -07:00 |
|
Yi Jiang
|
648ded3601
|
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d
am: a4b9203139
Change-Id: I012fb4827d7fa6b4ed25ec76a520fddb58b8b5ee
|
2019-05-24 21:11:17 -07:00 |
|
Bill Yi
|
3a87453b4b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0cf1a84f81 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibf83f1c2380b30459ca32db80d051e10bc14c2ec
|
2019-05-24 20:06:51 -07:00 |
|
Bill Yi
|
793e99ff96
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0cf1a84f81 -s ours
am skip reason: subject contains skip directive
Change-Id: If4c1028ee512d03e28a556dc70dba02d41543c1c
|
2019-05-24 20:06:19 -07:00 |
|
Yi Jiang
|
43f82bd3c4
|
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev
am: 79abf23f4d
Change-Id: I86d9e64d6d7afeb56e588c70068d1192bd52a1e2
|
2019-05-24 20:04:30 -07:00 |
|
Yi Jiang
|
a4b9203139
|
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev
am: 79abf23f4d
Change-Id: Iee258b27bed5dc6a7338ae64d52567e9bf759b0b
|
2019-05-24 20:04:23 -07:00 |
|
TreeHugger Robot
|
0cf1a84f81
|
Merge "Import translations. DO NOT MERGE" into qt-dev
|
2019-05-25 02:39:20 +00:00 |
|
Julia Reynolds
|
dc753187fd
|
Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217 am: f6578fc088
am: 9b6dd07073
Change-Id: Id93777a451998e8f264cd031386f49e38eb1bf6f
|
2019-05-24 19:12:50 -07:00 |
|
Julia Reynolds
|
eff5d75249
|
Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217 am: c70cdc69b5
am: c0b1bf6abb
Change-Id: I20490fff5399d355cc0b88ac887c1d02983f74a5
|
2019-05-24 19:03:51 -07:00 |
|
Evan Laird
|
d6e5b5eef3
|
Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff am: 1e3eb21b0d
am: e04352c32e
Change-Id: I911f0a848cf1425b3b218d142fc4cc7e08427a4e
|
2019-05-24 19:03:28 -07:00 |
|
Evan Laird
|
623cc03e11
|
Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff am: a433064df4
am: 22a6050035
Change-Id: I774539d62c337b7ec76ea74136c91f6da03124d6
|
2019-05-24 19:02:25 -07:00 |
|
Arc Wang
|
de950854e4
|
Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5 am: 96a7bcafb6
am: d7ece7edc9
Change-Id: If7e876ba1ea1f2e0006157f5b3c515a5b46f89b6
|
2019-05-24 19:02:04 -07:00 |
|
Arc Wang
|
605d827ecc
|
Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5 am: f7db4e4cc6
am: edd3b8dbaa
Change-Id: Iacf239b63bcd2dd5b2132e5d4c27742c29bca2ba
|
2019-05-24 19:01:45 -07:00 |
|
tmfang
|
9323cfda2a
|
Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61 am: 81c7772d3d
am: 3f0d6ece74
Change-Id: Ifd081710d2f92761f5d736685f9b69f4da6d23ef
|
2019-05-24 19:01:26 -07:00 |
|
Bill Yi
|
9790aacfde
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours am: 704789a5d5 -s ours
am: 5e371d6051 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib5c792f38dc2884542bd5d30b21d4917f7828296
|
2019-05-24 19:01:08 -07:00 |
|
Pasty Chang
|
c162d94f8b
|
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev am: 57ac23b2e5 am: 20cd84ebe6
am: 8638c5f02b
Change-Id: I0dc0a26c0eb0683b646e3f13007227a5e79fcdb0
|
2019-05-24 19:00:51 -07:00 |
|
tmfang
|
1bcf8873df
|
Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61 am: 848ead645b
am: ee4ca732ef
Change-Id: Ib81ac88e76507992649eebeba3d4910cae3f4ca5
|
2019-05-24 19:00:28 -07:00 |
|
Arc Wang
|
9a349a7538
|
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c am: 55f4c5eb65
am: f322c2a108
Change-Id: Id27b3e2c57feccd64a56193191e666d0573a516e
|
2019-05-24 18:59:48 -07:00 |
|
Yiwen Chen
|
0c36855e46
|
Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a am: b11ec2c1a3
am: 8456a0c868
Change-Id: If2692f4b0dda738fd9025e2aefe281569a74c82c
|
2019-05-24 18:59:28 -07:00 |
|
Beverly
|
3a99004085
|
Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8 am: 9d80859f78
am: 3524aedca3
Change-Id: I2773767679bbcbc47edef0172f4f742100acd506
|
2019-05-24 18:58:43 -07:00 |
|
Mehdi Alizadeh
|
195b5903db
|
Adds string resources for gesture not supported dialog
Bug: 129532605
Test: Manual test to verity the strings are shown correctly
Change-Id: Ibc451170e936e7b8e1bf1c0be07be33e2ddca6a4
|
2019-05-24 18:38:01 -07:00 |
|
Yi Jiang
|
79abf23f4d
|
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev
|
2019-05-25 01:20:28 +00:00 |
|
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 |
|