lindatseng
feb231fdec
Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35
am: b4896bd5a8
...
am: 64d202bdee
Change-Id: Ie6586ff3f36366677185e81da2b3e58674a71df9
2019-05-24 06:43:07 -07:00
Julia Reynolds
2732ac7c5e
Merge "Config notifs page updates" into qt-dev am: 1c83c08289
am: b30eb884ad
...
am: 5a4d7bda5a
Change-Id: I01bfc9dbe06ecf03df997b5f4f686b2258edd3dc
2019-05-24 06:42:10 -07:00
lindatseng
e337987e8a
Merge "Always create new task when launching WifiDialogActivity" into qt-dev am: 49776845e5
am: db7e223ca7
...
am: 50559c6fde
Change-Id: Ie95c87a195f8ba47a9134133412559996add5fcf
2019-05-24 06:41:14 -07:00
joshmccloskey
9465225085
Merge "Updated spacing" into qt-r1-dev am: bbdf816d5f
...
am: b8eb0031d4
Change-Id: I3933f4701ba753c5592d9b723299d76f3d748e2e
2019-05-24 06:40:19 -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
lindatseng
421c6e9f7b
Merge "Always create new task when launching WifiDialogActivity" into qt-dev am: 49776845e5
am: 0146947e25
...
am: 775f9c577a
Change-Id: I0e0a54c37cbdb314f71cb32d85e06cf2554f873d
2019-05-24 06:37:23 -07:00
Alexey Kuzmin
8c31d58fc2
Merge "Add a clarifying comment" into qt-dev am: b1e4072518
am: 0d87841f11
...
am: 024b216dc5
Change-Id: I8a63446558ea8b8a76c06c96ffc6c15ccf03ec51
2019-05-24 06:36:23 -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
bbbb4622c3
Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev am: ef0f8a4dab
am: 94004b05f3
...
am: 4a7c513869
Change-Id: I5b2ab05b2b85535ac4edc4d7746c3c8842e78af5
2019-05-24 06:34:16 -07:00
Mill Chen
50141e1cf4
Merge "Revert "Update dialog background color for dark theme"" into qt-dev am: 69faee7358
am: 89f32ab8c2
...
am: a23d5d917c
Change-Id: I4f9dc81b422a3cb81d2b3e57469a919447e899ff
2019-05-24 06:33:15 -07:00
Shuo Qian
21a8988cea
Merge "Add AutoCancel Notification UI for sim change" into qt-dev am: 2d2b224a09
am: 8ea9013963
...
am: bab2e5239a
Change-Id: Id6dbf67437bfbea69a1fbae3f321e82d12e0a6f5
2019-05-24 06:32:11 -07:00
Sorin Dinu
8cb12ee009
Merge "New icons for partial system update tile which is listed in the Security Status category." into qt-dev am: bab0f4c098
am: 326e64ac76
...
am: cd11ea4569
Change-Id: I39ae2a7f0f8caecf122ab46e23c8f8503a2774f8
2019-05-24 06:31:13 -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
Mill Chen
30298cdd63
Merge "Revert "Update dialog background color for dark theme"" into qt-dev am: 69faee7358
am: ab98f12e68
...
am: ba572939ba
Change-Id: I87e4da36ac286e8bfeb3c494075909f0e01a9776
2019-05-24 06:29:02 -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
tmfang
3f0d6ece74
Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61
...
am: 81c7772d3d
Change-Id: Ifa561bf7f344e6c42f441222b49ed05213626123
2019-05-24 03:25:45 -07:00
Bill Yi
5e371d6051
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff
-s ours
...
am: 704789a5d5
-s ours
am skip reason: subject contains skip directive
Change-Id: I04af1fa805919d6b97c47feb49f0ba8e356e01ae
2019-05-24 02:50:54 -07: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
Pasty Chang
8638c5f02b
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev am: 57ac23b2e5
...
am: 20cd84ebe6
Change-Id: I9568ec5483e9b5ffe4f6f9b7c64c13c164ca2247
2019-05-24 02:13:54 -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
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
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
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
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
Bill Yi
704789a5d5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 505a46f7ff
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia1e4e9356f25757d33b5e2fa9bb3c3d2efcbe5e1
2019-05-23 23:26:27 -07: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
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