Yi Jiang
db3457ea42
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d
...
am: 43f82bd3c4
Change-Id: Ifdecffdb5d3a4dcddc3675c18f316ddf0ebb0503
2019-05-24 21:22:23 -07:00
Bill Yi
60b0ca2c2a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81
-s ours
...
am: 793e99ff96
-s ours
am skip reason: subject contains skip directive
Change-Id: I8d283321c5f7f119d5b99d3658929d80fc327e01
2019-05-24 21:15:08 -07:00
Yi Jiang
648ded3601
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d
...
am: a4b9203139
Change-Id: I012fb4827d7fa6b4ed25ec76a520fddb58b8b5ee
2019-05-24 21:11:17 -07:00
Bill Yi
3a87453b4b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 0cf1a84f81
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibf83f1c2380b30459ca32db80d051e10bc14c2ec
2019-05-24 20:06:51 -07: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
43f82bd3c4
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev
...
am: 79abf23f4d
Change-Id: I86d9e64d6d7afeb56e588c70068d1192bd52a1e2
2019-05-24 20:04:30 -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
Mehdi Alizadeh
195b5903db
Adds string resources for gesture not supported dialog
...
Bug: 129532605
Test: Manual test to verity the strings are shown correctly
Change-Id: Ibc451170e936e7b8e1bf1c0be07be33e2ddca6a4
2019-05-24 18:38:01 -07: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
Julia Reynolds
9b6dd07073
Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217
...
am: f6578fc088
Change-Id: I9cae221ff76a5e41d0bbd1843ebd474793069e37
2019-05-24 16:25:26 -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
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
e04352c32e
Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff
...
am: 1e3eb21b0d
Change-Id: Ie3ecd4a9675d009efe86f9f282eb4fe05f3c8717
2019-05-24 11:28:07 -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
tmfang
a00e725b0a
Tweak title for "App content"
...
Test: visual
Bug: 133370964
Change-Id: I6351df67164b35dc1299aa5a57ab10325af575de
2019-05-25 00:24:02 +08:00
Arc Wang
d7ece7edc9
Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5
...
am: 96a7bcafb6
Change-Id: I082c8b8197adb02f7fa857df06ebf35ba38b97cc
2019-05-24 08:04:36 -07: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
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
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