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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
505a46f7ff
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-24 06:13:20 +00:00
Pasty Chang
57ac23b2e5
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev
2019-05-24 05:48:05 +00: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
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
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
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
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
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
Lei Yu
2bdf358cd1
Merge "Hide network select in some situations" into qt-dev
2019-05-23 20:28:38 +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
Steve Elliott
61d2a1ae90
Merge "Remove info footer in global actions panel settings" into qt-dev
...
am: b731f4d5b9
Change-Id: Id4f69f671aaff77325d1ad2e9fd915388f9a9fe0
2019-05-23 08:38:00 -07:00
Steve Elliott
b731f4d5b9
Merge "Remove info footer in global actions panel settings" into qt-dev
2019-05-23 15:25:40 +00: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
Mady Mellor
179e585d36
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev
...
am: 0b37ea8b6d
Change-Id: I5b2295d59d00b9df0fa93a3d300baa8975994678
2019-05-23 07:44:07 -07:00
tmfang
b50bdf2c13
Merge "Fix overlapping problem on wifi detail screen" into qt-dev
...
am: f59844570e
Change-Id: Ic7723df5c956208c71945dc2c0008fe4872a529b
2019-05-23 07:43:09 -07:00
Mady Mellor
f7f1dd37c2
Merge "App Bubble control page should always be available, even if off globally" into qt-dev
2019-05-23 13:58:19 +00:00
Mady Mellor
0b37ea8b6d
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev
2019-05-23 13:58:00 +00:00
TreeHugger Robot
f59844570e
Merge "Fix overlapping problem on wifi detail screen" into qt-dev
2019-05-23 13:13:48 +00:00
Arc Wang
0d706f0047
Fix Wi-Fi QR code decode fail
...
ZXing generate QR code with default encoding ISO-8859-1,
the generated QR code is wrong encoded if there is a
character outside of the charset.
Generate QR code of UTF-8 encoding.
Bug: 131851854
Test: manual
Change-Id: I96a5e72a978c654b62d89b3b11dd3016bf0ee1df
2019-05-23 20:41:45 +08:00
Beverly
2f41418c0d
Add ability to adjust height of VideoPreference
...
Test: manual
Bug: 132108705
Change-Id: I3b2172764908f408ba96bc6ef6dc0305f4dabd28
2019-05-23 11:53:35 +00:00
Alan Stokes
5b1b45b498
Merge "Background activity starts are now blocked by default." into qt-dev
...
am: 3178ea5f2d
Change-Id: I98a1e7b51f56acb15d4f7118bced2e20d8a7f152
2019-05-23 03:11:59 -07:00