Julia Reynolds
67471c290a
Merge "Move priorization setting to dev options" into qt-dev
...
am: 64f229d32b
Change-Id: I17f48bbdea860e1b8e4b333f2370d446e906eaa9
2019-05-28 10:08:48 -07:00
TreeHugger Robot
64f229d32b
Merge "Move priorization setting to dev options" into qt-dev
2019-05-28 16:59:35 +00:00
Fan Zhang
326f60b6bc
Merge "Fix overlapping problem in AlertDialog" into qt-dev
...
am: 574679ace4
Change-Id: I1a39f1596c9148bd3e970c443d2d4dd0bdff0080
2019-05-28 09:49:28 -07:00
Fan Zhang
574679ace4
Merge "Fix overlapping problem in AlertDialog" into qt-dev
2019-05-28 16:32:23 +00:00
Mill Chen
fb72f38c58
Fix overlapping problem in AlertDialog
...
Because clipChildren and clipToPadding by default are set to false in
the Settings, this will cause the strings overlapping with the title
of AlertDialog. These 2 attributes in the Theme.AlertDialog are set to
true to fix this problem.
Fixes: 133731437
Test: visual
Change-Id: I57ea48ac97c64dac6dfeec711daf4f40dc131ff6
2019-05-28 16:31:56 +00:00
Julia Reynolds
ada3676b2d
Move priorization setting to dev options
...
Under the other notif channel setting
Test: atest
Fixes: 133747537
Change-Id: I22fcf348b2070758a752babe64fe2af60fbe95a4
2019-05-28 15:33:22 +00:00
Raff Tsai
08b3d016f4
Merge "Fix failed test case" into qt-dev
...
am: fb28f92f71
Change-Id: I4649655d6a97e6a7e4d4641154319628905498ae
2019-05-27 09:47:32 -07:00
Raff Tsai
73cda7c700
Fix icon color in dark mode
...
am: e30f61f739
Change-Id: I04179fd328a393e8bd5ff891bd86665a8f37cbbb
2019-05-27 09:47:10 -07:00
TreeHugger Robot
fb28f92f71
Merge "Fix failed test case" into qt-dev
2019-05-27 16:41:13 +00:00
Raff Tsai
e30f61f739
Fix icon color in dark mode
...
Fixes: 133651524
Test: visual
Change-Id: Ic6f05dc491ad1d49b5cc81e294bf91271420d8e2
2019-05-27 18:32:35 +08:00
Kyunglyul Hyun
19d3dcadb9
Merge "Set media router group id to sync cast status" into qt-dev
...
am: 9d33198dc2
Change-Id: Ia4802bde8e253c542d4aa3b7c59b9771935fc460
2019-05-26 19:49:23 -07:00
Kyunglyul Hyun
9d33198dc2
Merge "Set media router group id to sync cast status" into qt-dev
2019-05-27 02:35:27 +00:00
Raff Tsai
83df51ebf3
Fix failed test case
...
Fixes: 133629032
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core"
Change-Id: I4baf0582a528e3601ca132c15e5078bc0159a352
2019-05-27 09:33:02 +08:00
Kyunglyul Hyun
be3b50a8f1
Set media router group id to sync cast status
...
Using media router group id, Settings can sync cast status with
Settings.
If Settings begins/stops cast (mirrorring), CastTile can know that and
Settings also knows when CastTile begins cast.
Please refer ag/7669852 to how router group id can be used to
synchronize cast status.
Bug: 112826114
Bug: 131385091
Bug: 130345243
Test: Manually tested after applying ag/7704172 and this.
Change-Id: I78c3c6163e1352b3a8d0801890064369a861fb8a
2019-05-26 23:05:35 +09: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
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
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
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
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
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
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
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
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
848ead645b
Merge "Fix no apps shown on app info screen" into qt-dev
...
am: 11e4847d61
Change-Id: Ia02de4e31fb573ed77b960ed357d8de39c27e8fd
2019-05-24 01:10:58 -07:00
TreeHugger Robot
11e4847d61
Merge "Fix no apps shown on app info screen" into qt-dev
2019-05-24 08:03:26 +00:00
Arc Wang
352d866af7
Fix Wi-Fi QR scanner crash problem
...
1. Should only set picture size from the list of supported picture sizes.
To choose the best picture size, we should keep ratio as preview size to
avoid image distortion and QR code scan failure.
2. When Camera#setOneShotPreviewCallback callbacks, the image data is of
preview size, not picture size.
Bug: 132866467
Test: QrCameraTest
manual
Change-Id: I087e5fcdf064f111e915e0872b50ca5a45ff1d26
2019-05-24 14:43:06 +08:00
tmfang
71dea4743e
Fix no apps shown on app info screen
...
If Settings app hasn't loaded apps list completely yet,
we can't filter result from list. Since there is nothing
can be filtered, we just need to show all apps.
Test: visual
Fixes: 131697606
Change-Id: I971c942b0fe5889206c40d855f8508acd42461a7
2019-05-24 14:30:42 +08: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
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
Pasty Chang
57ac23b2e5
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev
2019-05-24 05:48:05 +00: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
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
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
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
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
Lei Yu
2bdf358cd1
Merge "Hide network select in some situations" into qt-dev
2019-05-23 20:28:38 +00:00