Arc Wang
|
f322c2a108
|
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c
am: 55f4c5eb65
Change-Id: I711d8362ae2cab21caa0d7e4fd434829c299e023
|
2019-05-24 00:54:24 -07:00 |
|
Yiwen Chen
|
8456a0c868
|
Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a
am: b11ec2c1a3
Change-Id: Ifd7731c02614d4c6cc4173c2f8de3d16bd88b3df
|
2019-05-24 00:49:33 -07:00 |
|
Beverly
|
3524aedca3
|
Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8
am: 9d80859f78
Change-Id: Ic7d79bf84ba247f4531a9ae2ce198e4fe1ffa277
|
2019-05-24 00:45:49 -07:00 |
|
Steve Elliott
|
2d54a75e9a
|
Merge "Add entry point to global actions panel settings" into qt-dev am: 4b5d31fe67
am: 3a1573b19d
Change-Id: I06034e91020c685675e5652d2cdf265f91648bd5
|
2019-05-24 00:39:00 -07:00 |
|
Bill Yi
|
8ca592e6cc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours
am: 3c1ce4f32d -s ours
am skip reason: subject contains skip directive
Change-Id: Ic3328db0d43a2848c39bda221d8aeea63a24e850
|
2019-05-23 23:43:00 -07:00 |
|
Bill Yi
|
3c1ce4f32d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 505a46f7ff -s ours
am skip reason: subject contains skip directive
Change-Id: Id81e0e7186388c93c08bf48cce05eb292fdd4732
|
2019-05-23 23:27:11 -07:00 |
|
Pasty Chang
|
10c14115fc
|
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev am: 57ac23b2e5
am: a9d7d4fa9a
Change-Id: If8c99e3bb502a7b352c6904ed2cbd4bdce14d68e
|
2019-05-23 23:17:20 -07:00 |
|
Arc Wang
|
842b421420
|
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c
am: 3e39f94880
Change-Id: I53350e526743e3fb4597eabe04af9ec54f74a0e2
|
2019-05-23 23:15:05 -07:00 |
|
Pasty Chang
|
a9d7d4fa9a
|
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev
am: 57ac23b2e5
Change-Id: I8fa351eb810616c189ee412dab1832c8afe0e6d2
|
2019-05-23 23:13:24 -07:00 |
|
TreeHugger Robot
|
505a46f7ff
|
Merge "Import translations. DO NOT MERGE" into qt-dev
|
2019-05-24 06:13:20 +00:00 |
|
Yiwen Chen
|
2dd7a569bb
|
Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a
am: 7176ddc247
Change-Id: Ib04c4b59431a55a445167bcb8aa7de9812d03d21
|
2019-05-23 22:57:19 -07:00 |
|
Beverly
|
6cc9f36ba9
|
Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8
am: 3f5d795953
Change-Id: Idb654d1583253092456a01ed63b1329618a424fb
|
2019-05-23 22:55:06 -07:00 |
|
Pasty Chang
|
57ac23b2e5
|
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev
|
2019-05-24 05:48:05 +00:00 |
|
Steve Elliott
|
b136e0a5ce
|
Merge "Add entry point to global actions panel settings" into qt-dev am: 4b5d31fe67
am: d5c5c8ab9f
Change-Id: I0d80057b84e77eb9cad12a11c3d61ab1a8ab6870
|
2019-05-23 22:34:15 -07:00 |
|
Joshua Mccloskey
|
a26dd34be7
|
Merge "Added different button for non SUW enrollment" into qt-r1-dev
am: d9db8cb608
Change-Id: I56dced9ce66b018d51e4f616f5f769246fa2bc75
|
2019-05-23 22:20:24 -07:00 |
|
Arc Wang
|
55f4c5eb65
|
Merge "Fix Wi-Fi QR code decode fail" into qt-dev
am: 27d09aeb0c
Change-Id: I9345c2aa577871b3c3fc22ac6960708dac268f5c
|
2019-05-23 22:19:45 -07:00 |
|
Yiwen Chen
|
b11ec2c1a3
|
Merge "Keep consistency between sound and accessibility settings." into qt-dev
am: 6843e0247a
Change-Id: I8df347b5fba7b83de67f4bf71123cd64026b4587
|
2019-05-23 22:18:09 -07:00 |
|
Arc Wang
|
3e39f94880
|
Merge "Fix Wi-Fi QR code decode fail" into qt-dev
am: 27d09aeb0c
Change-Id: If4e777dba0ed9c127d66566a510713534a951ddd
|
2019-05-23 22:16:25 -07:00 |
|
Beverly
|
9d80859f78
|
Merge "Add ability to adjust height of VideoPreference" into qt-dev
am: d5daa47be8
Change-Id: Id6f55c6d11c6da3e6cb993a70e2973f896f3ce63
|
2019-05-23 22:16:15 -07:00 |
|
Yiwen Chen
|
7176ddc247
|
Merge "Keep consistency between sound and accessibility settings." into qt-dev
am: 6843e0247a
Change-Id: I21da5bf92dcdd6be217ddb9db4b0f81423f484c7
|
2019-05-23 22:15:11 -07:00 |
|
Beverly
|
3f5d795953
|
Merge "Add ability to adjust height of VideoPreference" into qt-dev
am: d5daa47be8
Change-Id: Iee281a8eeecd9dab5fff117a5035daa8440628e3
|
2019-05-23 22:14:04 -07:00 |
|
Steve Elliott
|
3a1573b19d
|
Merge "Add entry point to global actions panel settings" into qt-dev
am: 4b5d31fe67
Change-Id: I113dd052dbf86f2d7053ac90ca86fcf7b86adf23
|
2019-05-23 22:13:59 -07:00 |
|
Steve Elliott
|
d5c5c8ab9f
|
Merge "Add entry point to global actions panel settings" into qt-dev
am: 4b5d31fe67
Change-Id: Ia1df945feebe39f875a041d243e26abaf6c41fe2
|
2019-05-23 22:09:49 -07:00 |
|
Bill Yi
|
5e46b2fa9a
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I94fac2cb3ffc0d7784b0641f0b3974f56b326be9
|
2019-05-23 22:03:41 -07:00 |
|
Joshua Mccloskey
|
d9db8cb608
|
Merge "Added different button for non SUW enrollment" into qt-r1-dev
|
2019-05-24 02:36:54 +00:00 |
|
Arc Wang
|
27d09aeb0c
|
Merge "Fix Wi-Fi QR code decode fail" into qt-dev
|
2019-05-24 01:56:42 +00:00 |
|
Yiwen Chen
|
6843e0247a
|
Merge "Keep consistency between sound and accessibility settings." into qt-dev
|
2019-05-24 01:24:52 +00:00 |
|
Yiwen Chen
|
85580fbc88
|
Keep consistency between sound and accessibility settings.
Bug: 130741987
Test: Tested on device
Change-Id: Id6dd485c73f9453970b8d79929ffc04acb2c76c8
(cherry picked from commit 494071463b)
|
2019-05-24 01:24:35 +00:00 |
|
TreeHugger Robot
|
d5daa47be8
|
Merge "Add ability to adjust height of VideoPreference" into qt-dev
|
2019-05-24 01:19:59 +00:00 |
|
TreeHugger Robot
|
4b5d31fe67
|
Merge "Add entry point to global actions panel settings" into qt-dev
|
2019-05-24 01:14:40 +00:00 |
|
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 |
|
joshmccloskey
|
cf8e9af588
|
Added different button for non SUW enrollment
Bug: 133416320
Test: Manual.
Change-Id: I7087d5d4aa8f41e8d357f6fb41774d1bc62c17d9
|
2019-05-23 13:19:00 -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 |
|