tmfang
ee4ca732ef
Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61
...
am: 848ead645b
Change-Id: If3b73c2f521282f83f6e9aa53fcf671bb9bedadb
2019-05-24 01:17:19 -07:00
tmfang
81c7772d3d
Merge "Fix no apps shown on app info screen" into qt-dev
...
am: 11e4847d61
Change-Id: I736f60c5bd62114ab9a4bdbf5ff7a041a046940f
2019-05-24 01:11:13 -07: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
Pasty Chang
20cd84ebe6
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev
...
am: 57ac23b2e5
Change-Id: Idac1d81d17391abe4386d63a163db77728925688
2019-05-23 23:18:46 -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
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
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
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
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
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
TreeHugger Robot
4e27d29e6d
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev
2019-05-23 19:17:27 +00:00
TreeHugger Robot
535f0489c9
Merge "Remove gentle/alerting icons from channel settings" into qt-dev
2019-05-23 18:17:46 +00:00
Julia Reynolds
e6ad9d98e2
Allow the default SMS app to be blocked
...
Test: manual
Fixes: 133413626
Change-Id: Iebbba87e31bb3126da179c140eef42311b0be33e
2019-05-23 14:04:18 -04:00
Lei Yu
2bf8806740
Hide network select in some situations
...
Hide network select when:
1. NETWORK_MODE_LTE_CDMA_EVDO && worldMode
2. 6 NETWORK_MODE && worldMode && !Tdscdma
Also update GSM/CDMA check since it was only include 1 network mode,
not 6 modes.
Fixes: 131126607
Test: RunSettingsRoboTests
Change-Id: I28782778827ced7d9f24d527d52399e2b544109e
2019-05-23 09:56:28 -07:00
Mady Mellor
34c7eac424
Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2
...
am: 4740a76fd4
Change-Id: I1939a419fccc83943f4297595d1400378017ccba
2019-05-23 08:07:12 -07:00
Mady Mellor
f0da39b736
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev am: 0b37ea8b6d
...
am: 03e5e847f7
Change-Id: Ia51e59cccfe66bba4b636a0ebad757b24b64f8b6
2019-05-23 08:06:18 -07:00
tmfang
cb2f916eac
Merge "Fix overlapping problem on wifi detail screen" into qt-dev am: f59844570e
...
am: 9b9359547c
Change-Id: Iea192e4d92c2c3e7c903dd99f2b06a8258d3af50
2019-05-23 08:05:21 -07:00
Mady Mellor
f4845105b9
Merge "App Bubble control page should always be available, even if off globally" into qt-dev
...
am: f7f1dd37c2
Change-Id: Iae957998688392d32cfb693a32d02353ffa39bbd
2019-05-23 07:44:58 -07:00