Julia Reynolds
9b8273c9d8
Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217
...
am: c70cdc69b5
2019-05-24 11:09:21 -07:00
Evan Laird
aa554df788
Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff
...
am: 1e3eb21b0d
2019-05-24 11:08:21 -07:00
Julia Reynolds
c70cdc69b5
Merge "Allow the default SMS app to be blocked" into qt-dev
...
am: aaecede217
2019-05-24 10:13:57 -07:00
Evan Laird
1e3eb21b0d
Merge "Simplify channel importance settings screen" into qt-dev
...
am: 4321e038ff
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
aa18e7ebf5
Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5
...
am: f7db4e4cc6
2019-05-24 07:57:11 -07:00
Arc Wang
f7db4e4cc6
Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev
...
am: 7d7353c3b5
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
24002dd702
Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61
...
am: 848ead645b
2019-05-24 01:17:01 -07:00
tmfang
848ead645b
Merge "Fix no apps shown on app info screen" into qt-dev
...
am: 11e4847d61
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
Bill Yi
994f5d104a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours
...
am: 3c1ce4f32d
2019-05-24 00:06:09 -07:00
Pasty Chang
362c8b274b
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev am: 57ac23b2e5
...
am: a9d7d4fa9a
2019-05-23 23:59:42 -07: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
Arc Wang
f0f5409b56
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c
...
am: 3e39f94880
2019-05-23 23:32:47 -07: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
2019-05-23 23:27:11 -07:00
Yiwen Chen
02c784b617
Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a
...
am: 7176ddc247
2019-05-23 23:25:42 -07:00
Beverly
5f52d64a87
Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8
...
am: 3f5d795953
2019-05-23 23:18:22 -07:00
Pasty Chang
a9d7d4fa9a
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev
...
am: 57ac23b2e5
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
Steve Elliott
ac059db645
Merge "Add entry point to global actions panel settings" into qt-dev am: 4b5d31fe67
...
am: d5c5c8ab9f
2019-05-23 22:57:34 -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
Joshua Mccloskey
062d02043e
Merge "Added different button for non SUW enrollment" into qt-r1-dev
...
am: d9db8cb608
2019-05-23 22:17:34 -07:00
Arc Wang
3e39f94880
Merge "Fix Wi-Fi QR code decode fail" into qt-dev
...
am: 27d09aeb0c
2019-05-23 22:16:25 -07:00
Yiwen Chen
7176ddc247
Merge "Keep consistency between sound and accessibility settings." into qt-dev
...
am: 6843e0247a
2019-05-23 22:15:11 -07:00
Beverly
3f5d795953
Merge "Add ability to adjust height of VideoPreference" into qt-dev
...
am: d5daa47be8
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
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
Lei Yu
5f3c55b919
Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1
...
am: 52c51fd26f
2019-05-23 19:21:34 -07:00
Varun Shah
22c60f7215
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d
...
am: dfdac2d9e0
2019-05-23 19:14:03 -07:00
Evan Laird
3d87119200
Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9
...
am: 81141a5918
2019-05-23 19:06:52 -07:00
Joshua Mccloskey
cffd260ade
Merge "Reduced time to 3 seconds." into qt-r1-dev
...
am: da74cc8cc7
2019-05-23 18:59:25 -07:00
Arc Wang
27d09aeb0c
Merge "Fix Wi-Fi QR code decode fail" into qt-dev
2019-05-24 01:56:42 +00:00
Joshua Mccloskey
5edf273704
Merge "Fixed accessibility size" into qt-r1-dev
...
am: 3c58799231
2019-05-23 18:52:06 -07: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
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
2019-05-23 14:21:17 -07:00
Evan Laird
81141a5918
Merge "Remove gentle/alerting icons from channel settings" into qt-dev
...
am: 535f0489c9
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
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
