Lucas Lin
903e8dac6c
Merge "Create a string for private DNS "On""
...
am: a64f8d9521
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
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
TreeHugger Robot
de70e24f47
Merge "Pass context for Starred Contacts Summary"
2019-07-23 23:54:04 +00:00
Bill Yi
cbfa8dfad1
[automerger skipped] Import translations. DO NOT MERGE am: fe36dd6834 -s ours
...
am: 7edf8eb90e
2019-07-23 15:27:36 -07:00
Bill Yi
7edf8eb90e
[automerger skipped] Import translations. DO NOT MERGE
...
am: fe36dd6834
2019-07-23 15:17:31 -07:00
Bill Yi
01b89e8746
[automerger skipped] Import translations. DO NOT MERGE
...
am: fe36dd6834
2019-07-23 15:15:59 -07:00
Beverly
ea42ef17e6
Pass context for Starred Contacts Summary
...
So the correct context will be used to obtain the
correct translation for the summary string
Test: manual
Fixes: 138158873
Change-Id: I3d121fdfc7587870a86f7ad56f4efcbde664586d
2019-07-23 21:22:41 +00: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
Yanting Yang
6c906dfaa7
Merge "Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d am: 920f6109a8" into qt-r1-dev-plus-aosp
...
am: 6a014082b6
2019-07-23 09:57:13 -07:00
Yanting Yang
00c9114d88
Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d am: c453af3f91
...
am: 468e40e97c
2019-07-23 09:55:49 -07: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
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
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
2019-07-23 09:46:39 -07:00
Yanting Yang
920f6109a8
Merge "Support new regulatory label for location" into qt-dev
...
am: 28736bee5d
2019-07-23 09:37:45 -07:00
Yanting Yang
c453af3f91
Merge "Support new regulatory label for location" into qt-dev
...
am: 28736bee5d
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
TreeHugger Robot
e1f28f6ed7
Merge "Fix text format issue in the Accessibility magnification"
2019-07-23 11:12:36 +00:00
Sunny Shao
94276819c4
[automerger skipped] Merge "Use the date format to show the system update info" into qt-r1-dev am: a076039803
...
am: f67401a4c3162e88c262
2019-07-23 03:45:24 -07:00
Sunny Shao
f67401a4c3
Merge "Use the date format to show the system update info" into qt-r1-dev
...
am: a076039803
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
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
Yanting Yang
1303790f40
Fix text format issue in the Accessibility magnification
...
- Use getText() to apply html format to text view.
- Remove extra bullets from string.
Fixes: 138174003
Test: visual, robotests
Change-Id: Ia736087224d7a65ebe41ca2ac3fca7064a03f950
2019-07-23 17:37:31 +08:00
TreeHugger Robot
9f9acf6ff3
Merge "[Wi-Fi DPP] Refine code"
2019-07-23 01:51:01 +00:00
Mehdi Alizadeh
7833c334d7
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev am: 66b0cabf26
...
am: 418f942c0e
2019-07-22 17:16:07 -07: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
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
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
Quang Luong
b470e725c9
Added WifiSettings -> WifiSettings2 redirection behind feature flag
...
Use WifiSettings2 if settings_wifitracker2 feature flag is enabled.
WifiSettings2 will be used for changes to WifiSettings to incorporate
the WifiTracker2 refactor.
Bug: 70983952
Test: make, set feature flag, open Wifi settings to verify new page
opens.
Change-Id: I08edc227bf38ab4b3b785180bf123815bf95da81
2019-07-22 14:41:11 -07:00
Bill Yi
5975ec43fa
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad -s ours am: 6e57d54d35 -s ours
...
am: be17e5a4e6
2019-07-22 13:48:25 -07:00
Bill Yi
92a66b615b
[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad -s ours am: 57b150fedd -s ours
...
am: 6ef4683a15
2019-07-22 13:45:07 -07: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
2019-07-22 13:12:45 -07:00
Bill Yi
2f8b8b3f52
[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad -s ours
...
am: 6e57d54d35
2019-07-22 13:12:26 -07:00
Bill Yi
6ef4683a15
[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad -s ours
...
am: 57b150fedd
2019-07-22 13:12:00 -07:00
TreeHugger Robot
397741ea63
Merge "Reject SUITE_B_192 network creation for non EAP-TLS"
2019-07-22 20:06:39 +00:00
Bill Yi
6e57d54d35
[automerger skipped] Import translations. DO NOT MERGE
...
am: 7d966975ad
2019-07-22 12:53:25 -07:00
Bill Yi
57b150fedd
[automerger skipped] Import translations. DO NOT MERGE
...
am: 7d966975ad
2019-07-22 12:51:28 -07:00
Bill Yi
9943f149bd
[automerger skipped] Import translations. DO NOT MERGE am: 04a6245af9 -s ours
...
am: 3af7b7f342
2019-07-22 12:46:57 -07:00
Bill Yi
bab1717c87
[automerger skipped] Import translations. DO NOT MERGE
...
am: 04a6245af9
2019-07-22 12:25:43 -07:00
Bill Yi
3af7b7f342
[automerger skipped] Import translations. DO NOT MERGE
...
am: 04a6245af9
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
