Bill Yi
b0e9f90cee
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd
-s ours
...
am: 8611a6d851
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia14c2a36c4de7485f77c634aef5cadfc47bb1a50
2019-07-26 11:33:28 -07:00
Bill Yi
8611a6d851
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 8b9c85f0cd
-s ours
am skip reason: subject contains skip directive
Change-Id: I764355107924ecc67919bfbd1b134017aa07d5ca
2019-07-26 11:22:31 -07:00
TreeHugger Robot
8b9c85f0cd
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-26 17:39:58 +00:00
Bill Yi
9dff9b9c52
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I84fe706da2873676a567287114abc4e6a27c158c
2019-07-25 18:34:18 -07:00
Peiyong Lin
b6aae19d34
Remove prerelease driver option from Settings UI. am: c2dfba01ca
am: 546b4220c5
...
am: 422c394799
Change-Id: Ife605e2716278726aba076b6bb5d93b29e5bb7ca
2019-07-24 17:45:47 -07:00
Peiyong Lin
c21a3d0a69
Remove prerelease driver option from Settings UI. am: c2dfba01ca
am: 7c5bb0ecda
...
am: 70605be5b7
Change-Id: I32d55cdf9200a8910bd8bb8fa893faf905beffe8
2019-07-24 17:38:32 -07:00
Peiyong Lin
be6bc9e6bf
Remove prerelease driver option from Settings UI. am: c2dfba01ca
am: 7c5bb0ecda
...
am: b2a496c416
Change-Id: I113e3d30ae96087328d7112a7aa2967ed392475a
2019-07-24 17:37:36 -07:00
Peiyong Lin
422c394799
Remove prerelease driver option from Settings UI. am: c2dfba01ca
...
am: 546b4220c5
Change-Id: I74a7f4cbea9d0ea015cc6b69b8dfa304ed82e6db
2019-07-24 17:26:08 -07:00
Peiyong Lin
70605be5b7
Remove prerelease driver option from Settings UI. am: c2dfba01ca
...
am: 7c5bb0ecda
Change-Id: I17a752824ea403089efdf971aec87361aaacad39
2019-07-24 17:25:16 -07:00
Peiyong Lin
b2a496c416
Remove prerelease driver option from Settings UI. am: c2dfba01ca
...
am: 7c5bb0ecda
Change-Id: Icfe7daa49feffd7b46b887d41e34615c8c0df6f9
2019-07-24 17:25:14 -07:00
Peiyong Lin
7c5bb0ecda
Remove prerelease driver option from Settings UI.
...
am: c2dfba01ca
Change-Id: Ia0f23e48d9ed4ad10d01bebe23d4b8cdd62458c3
2019-07-24 16:59:33 -07:00
Peiyong Lin
546b4220c5
Remove prerelease driver option from Settings UI.
...
am: c2dfba01ca
Change-Id: Id48683555b1bdfc3dbc3a238c987f114ff029cc5
2019-07-24 16:59:33 -07:00
Android Build Merger (Role)
b6ee6e287d
Merge "Fix crash after uninstalling app am: 637d419157
am: cef4f97569" into qt-qpr1-dev-plus-aosp
2019-07-24 12:29:57 +00:00
Raff Tsai
03572035af
Fix crash after uninstalling app am: 637d419157
...
am: cef4f97569
Change-Id: Iaf2fe83efcd510962c71e757cad83f7e8f9e0943
2019-07-24 05:29:41 -07:00
Raff Tsai
e097aabbf9
Fix crash after uninstalling app am: 637d419157
...
am: 87dbb3c42c
Change-Id: I64e40aa595bdd9fe4a8870b28533dd22438d7a23
2019-07-24 05:29:40 -07:00
Raff Tsai
87dbb3c42c
Fix crash after uninstalling app
...
am: 637d419157
Change-Id: I48bf6ceb772fb5ebd1f6ebf8cff12ea664f963c5
2019-07-24 05:20:42 -07:00
Raff Tsai
cef4f97569
Fix crash after uninstalling app
...
am: 637d419157
Change-Id: Ib68843298dfcb71de6198a988f153397aabeb7f3
2019-07-24 05:20:40 -07:00
Raff Tsai
637d419157
Fix crash after uninstalling app
...
updateState was invoked in loader callback. But the
package was uninstalled at the callback time caused
null pointer exception. Add null check to prevent
null pointer access.
Fixes: 136170218
Fixes: 133771724
Test: make RunSettingsRoboTests, manual
Change-Id: I2715e77f6e32af42a4bce70c9f409b0311eb36c4
(cherry picked from commit 790a822526
)
2019-07-24 08:36:13 +00:00
Joshua Mccloskey
2d4df16487
Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979
...
am: 7e1e537e76
Change-Id: I55a341a94cad27275457ab3a36116a8f788e83a2
2019-07-23 22:15:21 -07:00
Joshua Mccloskey
f742e78e6f
Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979
...
am: 436155ba91
Change-Id: I4bdca0d0fe0cd5f38863eeb6975d026c424e6799
2019-07-23 22:14:08 -07:00
Lucas Lin
32bdab6035
Merge "Create a string for private DNS "On"" am: a64f8d9521
am: 903e8dac6c
am: c30cdecfba
...
am: e5cc01c3dc
Change-Id: Id15fc912e2d31b84c0a8ff5f28a92f11362f4056
2019-07-23 21:50:27 -07:00
Joshua Mccloskey
7e1e537e76
Merge "Add extra check for accessibility flow." into qt-r1-dev
...
am: c563fbb979
Change-Id: I0d84937b8029a8bdcec920123501fcb81f99f02f
2019-07-23 21:49:40 -07:00
Joshua Mccloskey
436155ba91
Merge "Add extra check for accessibility flow." into qt-r1-dev
...
am: c563fbb979
Change-Id: Ib0edf21c01d3e2086f61b80079e9efe5c2b231aa
2019-07-23 21:13:01 -07:00
Lucas Lin
e5cc01c3dc
Merge "Create a string for private DNS "On"" am: a64f8d9521
am: 903e8dac6c
...
am: c30cdecfba
Change-Id: I0384e4169df9a0efa423a0f2bae783ee5212e5b8
2019-07-23 21:10:21 -07:00
Lucas Lin
c30cdecfba
Merge "Create a string for private DNS "On"" am: a64f8d9521
...
am: 903e8dac6c
Change-Id: Id364ce04a54afe3abe8e9b240a6a6ed9864d5681
2019-07-23 20:56:43 -07:00
Lucas Lin
903e8dac6c
Merge "Create a string for private DNS "On""
...
am: a64f8d9521
Change-Id: I154269dc91acbefdce3cb6f76513d6b4f08f568b
2019-07-23 20:45:49 -07:00
Lucas Lin
a64f8d9521
Merge "Create a string for private DNS "On""
2019-07-24 03:15:01 +00:00
Joshua Mccloskey
c563fbb979
Merge "Add extra check for accessibility flow." into qt-r1-dev
2019-07-23 23:54:38 +00:00
Bill Yi
7edf8eb90e
[automerger skipped] Import translations. DO NOT MERGE
...
am: fe36dd6834
-s ours
am skip reason: subject contains skip directive
Change-Id: I21a0fe6886a4232bcb526dc8ade1dde41a7d0b72
2019-07-23 15:17:31 -07:00
Peiyong Lin
c2dfba01ca
Remove prerelease driver option from Settings UI.
...
BUG: 134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
2019-07-23 21:18:10 +00:00
Bill Yi
fe36dd6834
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I81487d87626426a7b7a969314691a6ce1177df4b
2019-07-23 13:19:18 -07:00
joshmccloskey
fae3193539
Add extra check for accessibility flow.
...
Bug: 138197084
Test: Verified other accessibility features like Live Transcribe does
not bring the user to the accessibility flow.
Test: Verified that the Sound Amplifier does not bring the user to
the accessibility flow.
Change-Id: I5131d74926c0b01c565da280c55afe0080855688
2019-07-23 19:13:08 +00:00
Android Build Merger (Role)
6a014082b6
Merge "Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
am: 920f6109a8" into qt-r1-dev-plus-aosp
2019-07-23 16:47:17 +00:00
Yanting Yang
468e40e97c
Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
...
am: c453af3f91
Change-Id: Iba9e810217cc4eee6c791eda6e3c100a851e9aa5
2019-07-23 09:46:44 -07:00
Yanting Yang
ed31ca806c
Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
...
am: 920f6109a8
Change-Id: I22c607437953b5f87fa30d5f53715535ab2e363c
2019-07-23 09:46:43 -07:00
Yanting Yang
920f6109a8
Merge "Support new regulatory label for location" into qt-dev
...
am: 28736bee5d
Change-Id: I2a2fb86c5062f38b52ac38366c619aa8e0bb2f00
2019-07-23 09:37:45 -07:00
Yanting Yang
c453af3f91
Merge "Support new regulatory label for location" into qt-dev
...
am: 28736bee5d
Change-Id: I0a966698855aa935b6acbf3829988d5004ff57e2
2019-07-23 09:37:45 -07:00
TreeHugger Robot
28736bee5d
Merge "Support new regulatory label for location" into qt-dev
2019-07-23 16:12:52 +00:00
lucaslin
be8701bca5
Create a string for private DNS "On"
...
The last private DNS settings screen landed in P after string
freeze, which led us to reuse R.string.switch_on_text for the
"on" text when private DNS is active. That string comes from
notifications. Private DNS should have its own string for this
instead.
Bug: 79122154
Test: 1. Build pass
2. make -j44 RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: Ie013a858c8bc41e00a1b940d02efa2b605991685
2019-07-23 19:40:09 +08:00
Sunny Shao
f67401a4c3
Merge "Use the date format to show the system update info" into qt-r1-dev
...
am: a076039803
Change-Id: I12eab14b3a406348d13436df5843727f0dccf71d
2019-07-23 03:36:02 -07:00
TreeHugger Robot
a076039803
Merge "Use the date format to show the system update info" into qt-r1-dev
2019-07-23 10:07:36 +00:00
Mehdi Alizadeh
418f942c0e
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
...
am: 66b0cabf26
Change-Id: I6ea0fe769b52345b8f148547d7950af9203c9926
2019-07-22 16:52:52 -07:00
Mehdi Alizadeh
66b0cabf26
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
2019-07-22 23:17:48 +00:00
Android Build Merger (Role)
be17e5a4e6
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad
-s ours am: 6e57d54d35
-s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-22 20:12:47 +00:00
Bill Yi
2f8b8b3f52
[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad
-s ours
...
am: 6e57d54d35
-s ours
am skip reason: subject contains skip directive
Change-Id: I7b25739458d86c2291f923e4c0521cfcaecd1744
2019-07-22 13:12:26 -07:00
Bill Yi
6ef4683a15
[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad
-s ours
...
am: 57b150fedd
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibef3a3f53cd897709dd8053f54c1179481e8a91e
2019-07-22 13:12:00 -07:00
Bill Yi
6e57d54d35
[automerger skipped] Import translations. DO NOT MERGE
...
am: 7d966975ad
-s ours
am skip reason: subject contains skip directive
Change-Id: I494a50f37bc0ae4d4d7979756fc067f575057224
2019-07-22 12:53:25 -07:00
Bill Yi
57b150fedd
[automerger skipped] Import translations. DO NOT MERGE
...
am: 7d966975ad
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie9d71673049fc02897d6ce5c9c16b8e7cee8b0e6
2019-07-22 12:51:28 -07:00
Bill Yi
3af7b7f342
[automerger skipped] Import translations. DO NOT MERGE
...
am: 04a6245af9
-s ours
am skip reason: subject contains skip directive
Change-Id: I59b9117b3767daeddfd91a10a490b46e4bb2b9d7
2019-07-22 12:24:56 -07:00
Bill Yi
7d966975ad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I0369197f24082cadfbb6b3ac72d33243231090ac
2019-07-22 10:59:39 -07:00