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
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
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
Julia Reynolds
c0b1bf6abb
Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217
...
am: c70cdc69b5
Change-Id: I119e6b4b56cdbd8b9cd15cc970f103bf20a6e930
2019-05-24 11:50:29 -07:00
Evan Laird
22a6050035
Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff
...
am: a433064df4
Change-Id: I547d4346aea58b8a2fa1e9a3470ac4877f73ed68
2019-05-24 11:23:24 -07:00
Julia Reynolds
f6578fc088
Merge "Allow the default SMS app to be blocked" into qt-dev
...
am: aaecede217
Change-Id: I0d29112d331f9bb4fb59ad40931c77701982e915
2019-05-24 10:16:01 -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
a433064df4
Merge "Simplify channel importance settings screen" into qt-dev
...
am: 4321e038ff
Change-Id: I9346139116adef62b83e1e85030c8371fa936375
2019-05-24 10:13:47 -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
edd3b8dbaa
Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5
...
am: f7db4e4cc6
Change-Id: I639d27195b04d2ac4cf97f338d8802b24a45b474
2019-05-24 07:57:32 -07:00
Arc Wang
96a7bcafb6
Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev
...
am: 7d7353c3b5
Change-Id: Ia366acf4c94763fa4836fe2d98c7b4e0abc86ac8
2019-05-24 07:52:31 -07: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
Alan Stokes
81ddb45922
Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d am: 5b1b45b498
...
am: 9a17e6265a
Change-Id: I24459012f6a6a0b4e3265d36423bed9cafa20d3e
2019-05-24 06:50:21 -07:00
Stanley Wang
69f6d559b0
Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3 am: 69893f95ae
...
am: 09dbc29187
Change-Id: I94a03587188d833536b13627776ba9c44af77492
2019-05-24 06:48:04 -07:00
Pasty Chang
ecbc4e524f
Merge "Apply stencil theme for description textview" into qt-dev am: 6746e15859 am: 1b4965583f
...
am: 7fef0c3b9b
Change-Id: I8becd16e32705caa22335a17321661e45942a4bc
2019-05-24 06:46:08 -07:00
Lei Yu
f945851e79
Merge "Update logic to build slider slice" into qt-dev am: 8866301b83 am: 1131a1e0d7
...
am: fc58ee09fb
Change-Id: I5f9cafd727000d9e9042aa2075ad05b235d33aff
2019-05-24 06:44:06 -07:00
lindatseng
fa23a8b1f2
Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35 am: b84816d05b
...
am: e204110910
Change-Id: I9fcfadf2cb02338b780e662ec4315a77ec50bf53
2019-05-24 06:39:30 -07:00
Julia Reynolds
642f5aeee8
Merge "Config notifs page updates" into qt-dev am: 1c83c08289 am: 4679c46a8a
...
am: 7528ab396e
Change-Id: Iecf21ae784fcf82b31a7ccbf4fe52e8950709996
2019-05-24 06:38:22 -07:00
Alexey Kuzmin
584613d784
Merge "Add a clarifying comment" into qt-dev am: b1e4072518 am: 0d97074f05
...
am: 4fc9f55bc2
Change-Id: I1236739df98e42e6ef91fb3b6d54e9a2b8fe914b
2019-05-24 06:35:22 -07:00
Mill Chen
2321b1037f
Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev am: ef0f8a4dab am: 388cca892a
...
am: fa23fcc795
Change-Id: Ic888037f538b15935e69149d01cfd8fa2eb31dbc
2019-05-24 06:30:15 -07: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
Shuo Qian
0da520c161
Merge "Add AutoCancel Notification UI for sim change" into qt-dev am: 2d2b224a09 am: 89f9e91075
...
am: e73593af34
Change-Id: Ie2e3ec993c13f0daaecca220bb1623037b70fd71
2019-05-24 02:35:00 -07:00
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