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
Joshua Mccloskey
1f8a8a41a6
Merge "Add extra check for accessibility flow." into qt-r1-dev
...
am: c563fbb979
Change-Id: Ie099ec3991ffb9f3bc2ef24737add7c23346ac43
2019-07-23 20:50:22 -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
android-build-team Robot
191e668268
Snap for 5749990 from c563fbb979
to qt-c2f2-release
...
Change-Id: Ic7a91c902b76d49f37919d33d33e7097a7880177
2019-07-24 03:00:31 +00:00
android-build-team Robot
c6d413daec
Merge cherrypicks of [8738218, 8738219, 8738140, 8736270, 8736271, 8736272, 8732114, 8738495, 8738319, 8736743, 8738320, 8738496] into qt-release
...
Change-Id: I64ad4e8161a96e4cc2e28ad24bd988894892910c
2019-07-24 02:22:47 +00:00
Yanting Yang
ad27235404
Support new regulatory label for location
...
Fixes: 137348817
Test: visual, robotests
Change-Id: I165b1e859891c7897e837d82702582458cecbb0d
(cherry picked from commit 49b1bc1545
)
2019-07-24 02:22:16 +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
Bill Yi
01b89e8746
[automerger skipped] Import translations. DO NOT MERGE
...
am: fe36dd6834
-s ours
am skip reason: subject contains skip directive
Change-Id: I3d8a274fba6c22008d45765b42f1bcb108445976
2019-07-23 15:15:59 -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
1a71b22120
Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
...
am: c453af3f91
Change-Id: I1f3c517c6056c1a12a64a274bf81aef50abe2d97
2019-07-23 09:46:39 -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
Sunny Shao
aff0054855
Merge "Use the date format to show the system update info" into qt-r1-dev
...
am: a076039803
Change-Id: I71fec74cc487b40a9cf167bff6cae060f309ef24
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
android-build-team Robot
eee76b33b7
Snap for 5746716 from 66b0cabf26
to qt-c2f2-release
...
Change-Id: I04433ff2076c1e2f2499b29793541c4a822a1c02
2019-07-23 03:09:51 +00:00
Quang Luong
f73d65c940
Default MAC address should display "Not Available" in network details
...
For saved networks that do not have a MAC address available in their
WifiConfiguration such as Passpoint networks, the MAC address will
be the default value of 20:00:00:00:00:00. In this case, display
"Not Available" as the summary of the MAC address preference.
Bug: 137282522
Test: atest WifiDetailPreferenceControllerTest &&
manual - open saved passpoint network details while disconnected
but in range and observe MAC address preference.
Change-Id: Ie9010b0430726de8105852ae2afe10047dcc3676
2019-07-22 17:06:51 -07:00
Mehdi Alizadeh
3d54229c38
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
...
am: 66b0cabf26
Change-Id: Iae76ee176083edefc6a8f6aab356751070689488
2019-07-22 16:55:15 -07: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
fa8d00ce1c
[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad
-s ours
...
am: 6e57d54d35
-s ours
am skip reason: subject contains skip directive
Change-Id: I79e5367a2c5a2a084265462a01c332d0815cbf03
2019-07-22 13:12:45 -07: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
bab1717c87
[automerger skipped] Import translations. DO NOT MERGE
...
am: 04a6245af9
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie51bb342d50b05a3f1d37572934effb4b4ab9b84
2019-07-22 12:25:43 -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
Bill Yi
04a6245af9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If2b98e7c7fadad3c2fb18275ed458da76e9cc7ac
2019-07-22 10:37:18 -07:00
Sunny Shao
47a1b24908
Use the date format to show the system update info
...
Use the "July 13, 2019" or similar to display if the value is a valid
date data.
Bug: 137089104
Test: visual test & robotest
Change-Id: Ie4bab2617c1cd6fd956bf6d1a22ce96e6b0b58d0
Merged-In: Ie4bab2617c1cd6fd956bf6d1a22ce96e6b0b58d0
(cherry picked from commit 162e88c262
)
2019-07-22 04:59:27 +00:00
android-build-team Robot
2d5d24dee6
Snap for 5743241 from efc7ac061c
to qt-c2f2-release
...
Change-Id: Ic5cc43bc5547208de0c10b2d4a9c6e60d7fbbe6c
2019-07-20 23:58:54 +00:00
Bill Yi
7d47128058
[automerger skipped] Import translations. DO NOT MERGE
...
am: efc7ac061c
-s ours
am skip reason: subject contains skip directive
Change-Id: I8639aa47b9d68a975ebc3b5fb44319509e177188
2019-07-19 14:05:21 -07:00
Bill Yi
ec64f48808
[automerger skipped] Import translations. DO NOT MERGE
...
am: efc7ac061c
-s ours
am skip reason: subject contains skip directive
Change-Id: Id1ff8188cc1638770dffc0d2f3eabbbd5660b73a
2019-07-19 14:04:20 -07:00
Yanting Yang
49b1bc1545
Support new regulatory label for location
...
Fixes: 137348817
Test: visual, robotests
Change-Id: I165b1e859891c7897e837d82702582458cecbb0d
2019-07-20 02:07:54 +08:00
TreeHugger Robot
f7e7bc4129
Merge "Use the Global value rather than the Secure value" into qt-r1-bubbles-dev
2019-07-19 17:55:47 +00:00
Bill Yi
efc7ac061c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ce6d671fe6587af26ea31b711da0d4594433ee6
2019-07-19 10:23:51 -07:00
Antony Sargent
f61428cf1d
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
...
am: 20ec6a4b6f
Change-Id: I72317d0d45103cbc4791e1f9d67e726d7426b758
2019-07-18 19:57:18 -07:00
Antony Sargent
dd874eeb54
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
...
am: 20ec6a4b6f
Change-Id: I512000e6041c3611d4c7715355d8564aa3261b01
2019-07-18 19:57:18 -07:00
TreeHugger Robot
20ec6a4b6f
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
2019-07-19 02:26:19 +00:00
Mehdi Alizadeh
1aaf41b2dc
Removes logic to disable gesture nav when default home app changes
...
Bug: 137197916
Test: Manual test with setting a 3P launcher as default
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Change-Id: Id397cfa1c2439222aa21a7b7fe5f69818bf1fe97
2019-07-18 15:27:05 -07:00