OSDN Git Service
Xin Li [Thu, 15 Aug 2019 07:16:41 +0000 (00:16 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am:
c3ef16882d -s ours am:
f8c25b6ac4 -s ours
am:
f62f61cbfb
Change-Id: I6b798a4044f146cad1f6824e17aa82f80521251f
Xin Li [Thu, 15 Aug 2019 06:52:30 +0000 (23:52 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am:
c3ef16882d -s ours
am:
f8c25b6ac4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ieeffd5db1009f7dda5b595f3a6790ec1f2ce6db8
Xin Li [Thu, 15 Aug 2019 06:32:21 +0000 (23:32 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
am:
c3ef16882d -s ours
am skip reason: subject contains skip directive
Change-Id: I1d1b46e30a9ec5b4e01f351342fe45ac64994d47
Xin Li [Wed, 14 Aug 2019 20:56:58 +0000 (13:56 -0700)]
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (
5713463) in stage-aosp-master am:
9821df1b1f -s ours
am:
8cabf84832
Change-Id: I8501d7bdfb3c8bb5e6ddf5e19aeb8335f81d18bf
Xin Li [Wed, 14 Aug 2019 20:32:06 +0000 (13:32 -0700)]
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (
5713463) in stage-aosp-master
am:
9821df1b1f -s ours
am skip reason: subject contains skip directive
Change-Id: If1da8066529d53cf10298533987f7d7f7c57d405
Xin Li [Wed, 14 Aug 2019 18:35:21 +0000 (11:35 -0700)]
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (
5713463) in stage-aosp-master
Bug:
134405016
Change-Id: I80e9ac9e5e6a21ebd94543865b8f75c20020360d
Jordan Liu [Wed, 14 Aug 2019 02:01:30 +0000 (19:01 -0700)]
Merge "Allow radio info on phones with no subscription" am:
19d1f890a0 am:
b377a593b7
am:
1fc63fc444
Change-Id: I114db364c10315dca50b75270fc14da7eaf1d354
Jordan Liu [Wed, 14 Aug 2019 01:48:49 +0000 (18:48 -0700)]
Merge "Allow radio info on phones with no subscription" am:
19d1f890a0
am:
b377a593b7
Change-Id: Ibe68e60583fdf2bd08d6d8f62b5c942878dd160e
Jordan Liu [Wed, 14 Aug 2019 01:37:15 +0000 (18:37 -0700)]
Merge "Allow radio info on phones with no subscription"
am:
19d1f890a0
Change-Id: Ia63778cf83212b2670413e2567c068bf92f6ff05
Jordan Liu [Wed, 14 Aug 2019 00:22:42 +0000 (00:22 +0000)]
Merge "Allow radio info on phones with no subscription"
Xin Li [Tue, 13 Aug 2019 23:36:39 +0000 (16:36 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
Bug:
139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
android-build-team Robot [Tue, 13 Aug 2019 16:25:08 +0000 (16:25 +0000)]
Snap for
5674421 from
4a949c0640373471f5699c7a5cf490731394c574 to pi-platform-release
Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9
Jordan Liu [Wed, 7 Aug 2019 23:51:36 +0000 (16:51 -0700)]
Allow radio info on phones with no subscription
Some info is still helpful for debugging in these cases.
Bug:
139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d
Christine Franks [Sun, 4 Aug 2019 07:55:55 +0000 (00:55 -0700)]
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
am:
37b38f872f
Change-Id: I298f71e7db0840e83af06f5662d6af2d5c60bbac
Christine Franks [Sun, 4 Aug 2019 07:55:33 +0000 (00:55 -0700)]
[DO NOT MERGE] Update title for null uri when setting changes
am:
ea14373666
Change-Id: I8f542126d98beefe8f221266b7f25bc9d7b0f4d5
Christine Franks [Sat, 3 Aug 2019 14:47:40 +0000 (14:47 +0000)]
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
Christine Franks [Thu, 1 Aug 2019 18:09:16 +0000 (11:09 -0700)]
[DO NOT MERGE] Update title for null uri when setting changes
Currently, the title will not update at all if set to silent.
Bug:
130445562
Test: make RunSettingsRoboTests -j48
Change-Id: Id8fc0182adb37c05436f5924b7dcdffb9d994e0d
Edgar Wang [Fri, 2 Aug 2019 05:49:22 +0000 (22:49 -0700)]
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am:
8e3b202070
Change-Id: Ic8c1eb744a1612fedd187902e65d7718500f4e8d
Edgar Wang [Fri, 2 Aug 2019 05:38:23 +0000 (05:38 +0000)]
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
Daniel Solomon [Thu, 1 Aug 2019 20:37:33 +0000 (13:37 -0700)]
Merge "Settings: change the color mode preview image" into qt-r1-dev
am:
c5fbd7b669
Change-Id: Icfc151ca32fa3ab44a68acc4732e3e9307372f22
TreeHugger Robot [Thu, 1 Aug 2019 19:58:47 +0000 (19:58 +0000)]
Merge "Settings: change the color mode preview image" into qt-r1-dev
Youming Ye [Thu, 1 Aug 2019 18:24:55 +0000 (11:24 -0700)]
Check the missing useHomeWfMode case
am:
b7923f5a3f
Change-Id: I8ffa6acb13e07b4a28b8f46b348ffc47c143a317
Edgar Wang [Mon, 29 Jul 2019 08:55:31 +0000 (16:55 +0800)]
Add skip lock screen in Notification & security lock screen settings
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >
Bug:
138458558
Test: robotest & manual
Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
Youming Ye [Tue, 11 Jun 2019 22:25:52 +0000 (15:25 -0700)]
Check the missing useHomeWfMode case
Bug:
133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
Antony Sargent [Wed, 31 Jul 2019 23:04:54 +0000 (16:04 -0700)]
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am:
4685c785b9
Change-Id: I1ce1afeee9ab139ff47a1deec14d536c8c9529ad
Bill Yi [Wed, 31 Jul 2019 22:53:13 +0000 (15:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
5a690f3c4c -s ours
am skip reason: subject contains skip directive
Change-Id: Ibc64425d1a731f6cbd45d44b18537edfdd88acbd
TreeHugger Robot [Wed, 31 Jul 2019 22:39:22 +0000 (22:39 +0000)]
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
Antony Sargent [Wed, 31 Jul 2019 19:53:39 +0000 (12:53 -0700)]
Protect entry points to add an eSIM when admin restricted
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.
The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.
The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.
Fixes:
137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
Daniel Solomon [Wed, 31 Jul 2019 18:46:39 +0000 (11:46 -0700)]
Settings: change the color mode preview image
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.
Bug:
138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
Bill Yi [Wed, 31 Jul 2019 19:09:08 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e51c61d9bdff182bc83a04242ccd6e1e4f9629d
Quang Luong [Wed, 31 Jul 2019 00:12:17 +0000 (17:12 -0700)]
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am:
17908b1e8f
Change-Id: I0adf1cc87a31b4daa762baf67e2e99415b35491a
TreeHugger Robot [Tue, 30 Jul 2019 23:33:22 +0000 (23:33 +0000)]
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
Antony Sargent [Tue, 30 Jul 2019 22:43:32 +0000 (15:43 -0700)]
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
am:
66208e734b
Change-Id: Ifb4c387a8663fda3a642b03b68777079d1c5a619
Bill Yi [Tue, 30 Jul 2019 22:42:26 +0000 (15:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
67afe87617 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaf9f87ae5aab01ba07c15825d8551460ae810354
TreeHugger Robot [Tue, 30 Jul 2019 22:33:32 +0000 (22:33 +0000)]
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
TreeHugger Robot [Tue, 30 Jul 2019 21:39:43 +0000 (21:39 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Antony Sargent [Tue, 30 Jul 2019 17:10:57 +0000 (10:10 -0700)]
Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.
Bug:
135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Bill Yi [Tue, 30 Jul 2019 18:55:38 +0000 (11:55 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id8561f757b8520ebbd976cc9b06fa833b68575d8
Bill Yi [Tue, 30 Jul 2019 18:53:10 +0000 (11:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
9af3e6a625 -s ours
am:
f5c8056f7a -s ours
am skip reason: subject contains skip directive
Change-Id: Ia98dea474d8c568821fe7612181a039f48bf9580
Bill Yi [Tue, 30 Jul 2019 18:43:41 +0000 (11:43 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
9af3e6a625 -s ours
am:
e5dd9176ca -s ours
am skip reason: subject contains skip directive
Change-Id: Ib09846428898767c3745f7b17e81f09de19eda66
Bill Yi [Tue, 30 Jul 2019 18:34:43 +0000 (11:34 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9af3e6a625 -s ours
am skip reason: subject contains skip directive
Change-Id: I30d1996db7f73e5e38515fad56ea9bc9d8f44450
Bill Yi [Tue, 30 Jul 2019 18:32:38 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
f63cb669ff -s ours
am skip reason: subject contains skip directive
Change-Id: I3a24b910fa6a98e131419c738600296abdca963b
Bill Yi [Tue, 30 Jul 2019 18:32:37 +0000 (11:32 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9af3e6a625 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic131b3c52fc5f2c0bd1b735a376df65108490f5e
TreeHugger Robot [Tue, 30 Jul 2019 18:09:15 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Antony Sargent [Tue, 30 Jul 2019 16:54:25 +0000 (09:54 -0700)]
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
am:
985d3d570d
Change-Id: I02252dd85f3b11aef3109e1a0193faba8bb9c240
TreeHugger Robot [Tue, 30 Jul 2019 16:41:29 +0000 (16:41 +0000)]
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
Bill Yi [Tue, 30 Jul 2019 00:02:13 +0000 (17:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie730f2fa36caf0c3d99159cc649ed7e24ca2ceec
Bill Yi [Mon, 29 Jul 2019 23:46:49 +0000 (16:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idbe888a8bb4d386d7d8e883cc530561c1a5806ad
Jason Chiu [Sat, 27 Jul 2019 01:45:07 +0000 (18:45 -0700)]
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
am:
04ad8c905a
Change-Id: Id2ee2415fffd70bcf94aa2a305125d983ae5bd9e
TreeHugger Robot [Sat, 27 Jul 2019 01:29:55 +0000 (01:29 +0000)]
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
Kevin Chyn [Sat, 27 Jul 2019 01:14:54 +0000 (18:14 -0700)]
[automerger skipped] Do not request cancel authentication unless currently authenticating am:
49c7d07650 -s ours
am:
587d8d7005 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1
0a33d62a17 is in history
Change-Id: I2ed1d97f1fa5104e1c381babc2625cb69b147b6c
Kevin Chyn [Sat, 27 Jul 2019 01:13:32 +0000 (18:13 -0700)]
Add ability to finish() ConfirmDeviceCredential if it loses foreground
am:
e27a304b97
Change-Id: Idcc2dab10c42016f0f440cbf495974bf3ee1ba94
Kevin Chyn [Sat, 27 Jul 2019 01:09:34 +0000 (18:09 -0700)]
[automerger skipped] Do not request cancel authentication unless currently authenticating am:
49c7d07650
am:
1c1191b640 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1
0a33d62a17 is in history
Change-Id: I662181a2cfd7b05c9929b868e2b76895f407678c
Kevin Chyn [Sat, 27 Jul 2019 00:50:13 +0000 (17:50 -0700)]
[automerger skipped] Do not request cancel authentication unless currently authenticating
am:
49c7d07650 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1
0a33d62a17 is in history
Change-Id: If5e6d4c715b0c3482f297c709320e2ca9f6fa209
Kevin Chyn [Sat, 27 Jul 2019 00:48:44 +0000 (17:48 -0700)]
Do not request cancel authentication unless currently authenticating
am:
49c7d07650
Change-Id: Id38d3648f75a79a3492677416c79fff960317a69
Kevin Chyn [Fri, 26 Jul 2019 21:53:20 +0000 (14:53 -0700)]
Add ability to finish() ConfirmDeviceCredential if it loses foreground
If user enters face settings but does not enter the password, then
turns off the screen, it's possible the challenge is invalidated. Instead,
we should finish() the device credential screen as well as FaceSettings.
This prevents
1) The user from being prompted for credential with lack of context
2) Credential returning a HAT that wraps an invalidated challenge
The user will be returned to the security settings screen, where they
have more context and can decide if they want to enter face settings again.
Fixes:
138273242
Test: 1) Open face settings, do not enter password
2) Press power button
3) Unlock keyguard
4) User is not presented with credential screen
Test: Go through SUW, turning on/off the screen at various security
screens. Able to enroll successfully
Change-Id: I3c3d4600138012821bb0eea7d2927df00011cdb0
Kevin Chyn [Fri, 26 Jul 2019 19:35:33 +0000 (12:35 -0700)]
Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
am:
ba4fad160d
Change-Id: Iea3b2552097a1decd9dc106e3a31d71d772ab1d6
Kevin Chyn [Fri, 26 Jul 2019 18:20:10 +0000 (11:20 -0700)]
Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.
BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.
The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.
Bug:
138279856
Test: BiometricPromptDemo, enable device credential fallback, get into
lockout state, successfully enter password. API result is
success instead of "canceled" now.
Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
Merged-In: I6521e896d0402fe856dc85476f51149c9b3084a8
Kevin Chyn [Fri, 26 Jul 2019 19:15:50 +0000 (19:15 +0000)]
Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
Antony Sargent [Fri, 12 Jul 2019 18:04:14 +0000 (11:04 -0700)]
Refesh mobile network details page on carrier config changes
In general the mobile network details page has several preference
controllers that don't listen to carrier config changes, so instead of
having each one add a listener, we instead just have one listener and
refresh the entire page when we see the broadcast.
Fixes:
135587885
Test: make RunSettingsRoboTests
Change-Id: Iff5b28dbfe12d94c901b442b23cece8e68218983
Bill Yi [Fri, 26 Jul 2019 18:22:31 +0000 (11:22 -0700)]
[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
Kevin Chyn [Fri, 26 Jul 2019 18:20:10 +0000 (11:20 -0700)]
Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.
BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.
The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.
Bug:
138279856
Test: BiometricPromptDemo, enable device credential fallback, get into
lockout state, successfully enter password. API result is
success instead of "canceled" now.
Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
TreeHugger Robot [Fri, 26 Jul 2019 17:39:58 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Fri, 26 Jul 2019 01:34:18 +0000 (18:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I84fe706da2873676a567287114abc4e6a27c158c
Jason Chiu [Thu, 25 Jul 2019 08:23:12 +0000 (16:23 +0800)]
Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings
"Ambient display" was merged into "Lock screen display", and the entry
was also moved from security page to display page and leveraged the
original user restriction of "Ambient display".
The user restriction should just work on the switch of Ambient display
instead of the "Lock screen display" entry.
Bug:
138177691
Test: robotest, visual
Change-Id: I5db0eb68c3aa6f4f7d8ecd42db2cdc72255b12f7
Peiyong Lin [Thu, 25 Jul 2019 00:26:08 +0000 (17:26 -0700)]
Remove prerelease driver option from Settings UI. am:
c2dfba01ca
am:
546b4220c5
Change-Id: I74a7f4cbea9d0ea015cc6b69b8dfa304ed82e6db
Peiyong Lin [Thu, 25 Jul 2019 00:25:16 +0000 (17:25 -0700)]
Remove prerelease driver option from Settings UI. am:
c2dfba01ca
am:
7c5bb0ecda
Change-Id: I17a752824ea403089efdf971aec87361aaacad39
Peiyong Lin [Wed, 24 Jul 2019 23:59:33 +0000 (16:59 -0700)]
Remove prerelease driver option from Settings UI.
am:
c2dfba01ca
Change-Id: Id48683555b1bdfc3dbc3a238c987f114ff029cc5
Peiyong Lin [Wed, 24 Jul 2019 23:59:33 +0000 (16:59 -0700)]
Remove prerelease driver option from Settings UI.
am:
c2dfba01ca
Change-Id: Ia0f23e48d9ed4ad10d01bebe23d4b8cdd62458c3
Raff Tsai [Wed, 24 Jul 2019 12:20:42 +0000 (05:20 -0700)]
Fix crash after uninstalling app
am:
637d419157
Change-Id: I48bf6ceb772fb5ebd1f6ebf8cff12ea664f963c5
Raff Tsai [Fri, 28 Jun 2019 10:17:14 +0000 (18:17 +0800)]
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
790a822526251236af196c3ae17f1990c75fb133)
Joshua Mccloskey [Wed, 24 Jul 2019 04:13:01 +0000 (21:13 -0700)]
Merge "Add extra check for accessibility flow." into qt-r1-dev
am:
c563fbb979
Change-Id: Ib0edf21c01d3e2086f61b80079e9efe5c2b231aa
Lucas Lin [Wed, 24 Jul 2019 04:10:21 +0000 (21:10 -0700)]
Merge "Create a string for private DNS "On"" am:
a64f8d9521 am:
903e8dac6c
am:
c30cdecfba
Change-Id: I0384e4169df9a0efa423a0f2bae783ee5212e5b8
Lucas Lin [Wed, 24 Jul 2019 03:56:43 +0000 (20:56 -0700)]
Merge "Create a string for private DNS "On"" am:
a64f8d9521
am:
903e8dac6c
Change-Id: Id364ce04a54afe3abe8e9b240a6a6ed9864d5681
Lucas Lin [Wed, 24 Jul 2019 03:45:49 +0000 (20:45 -0700)]
Merge "Create a string for private DNS "On""
am:
a64f8d9521
Change-Id: I154269dc91acbefdce3cb6f76513d6b4f08f568b
Lucas Lin [Wed, 24 Jul 2019 03:15:01 +0000 (03:15 +0000)]
Merge "Create a string for private DNS "On""
Joshua Mccloskey [Tue, 23 Jul 2019 23:54:38 +0000 (23:54 +0000)]
Merge "Add extra check for accessibility flow." into qt-r1-dev
Bill Yi [Tue, 23 Jul 2019 22:17:31 +0000 (15:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
fe36dd6834 -s ours
am skip reason: subject contains skip directive
Change-Id: I21a0fe6886a4232bcb526dc8ade1dde41a7d0b72
Peiyong Lin [Tue, 23 Jul 2019 17:27:47 +0000 (10:27 -0700)]
Remove prerelease driver option from Settings UI.
BUG:
134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
Bill Yi [Tue, 23 Jul 2019 20:19:18 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I81487d87626426a7b7a969314691a6ce1177df4b
joshmccloskey [Tue, 23 Jul 2019 00:10:55 +0000 (17:10 -0700)]
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
Android Build Merger (Role) [Tue, 23 Jul 2019 16:47:17 +0000 (16:47 +0000)]
Merge "Merge "Support new regulatory label for location" into qt-dev am:
28736bee5d am:
920f6109a8" into qt-r1-dev-plus-aosp
Yanting Yang [Tue, 23 Jul 2019 16:46:44 +0000 (09:46 -0700)]
Merge "Support new regulatory label for location" into qt-dev am:
28736bee5d
am:
c453af3f91
Change-Id: Iba9e810217cc4eee6c791eda6e3c100a851e9aa5
Yanting Yang [Tue, 23 Jul 2019 16:46:43 +0000 (09:46 -0700)]
Merge "Support new regulatory label for location" into qt-dev am:
28736bee5d
am:
920f6109a8
Change-Id: I22c607437953b5f87fa30d5f53715535ab2e363c
Yanting Yang [Tue, 23 Jul 2019 16:37:45 +0000 (09:37 -0700)]
Merge "Support new regulatory label for location" into qt-dev
am:
28736bee5d
Change-Id: I2a2fb86c5062f38b52ac38366c619aa8e0bb2f00
Yanting Yang [Tue, 23 Jul 2019 16:37:45 +0000 (09:37 -0700)]
Merge "Support new regulatory label for location" into qt-dev
am:
28736bee5d
Change-Id: I0a966698855aa935b6acbf3829988d5004ff57e2
TreeHugger Robot [Tue, 23 Jul 2019 16:12:52 +0000 (16:12 +0000)]
Merge "Support new regulatory label for location" into qt-dev
lucaslin [Tue, 23 Jul 2019 11:40:09 +0000 (19:40 +0800)]
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
Sunny Shao [Tue, 23 Jul 2019 10:36:02 +0000 (03:36 -0700)]
Merge "Use the date format to show the system update info" into qt-r1-dev
am:
a076039803
Change-Id: I12eab14b3a406348d13436df5843727f0dccf71d
TreeHugger Robot [Tue, 23 Jul 2019 10:07:36 +0000 (10:07 +0000)]
Merge "Use the date format to show the system update info" into qt-r1-dev
Quang Luong [Fri, 19 Jul 2019 18:28:03 +0000 (11:28 -0700)]
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
Mehdi Alizadeh [Mon, 22 Jul 2019 23:52:52 +0000 (16:52 -0700)]
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
am:
66b0cabf26
Change-Id: I6ea0fe769b52345b8f148547d7950af9203c9926
Mehdi Alizadeh [Mon, 22 Jul 2019 23:17:48 +0000 (23:17 +0000)]
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
Android Build Merger (Role) [Mon, 22 Jul 2019 20:12:47 +0000 (20:12 +0000)]
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
Bill Yi [Mon, 22 Jul 2019 20:12:26 +0000 (13:12 -0700)]
[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
Bill Yi [Mon, 22 Jul 2019 20:12:00 +0000 (13:12 -0700)]
[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
Bill Yi [Mon, 22 Jul 2019 19:53:25 +0000 (12:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
7d966975ad -s ours
am skip reason: subject contains skip directive
Change-Id: I494a50f37bc0ae4d4d7979756fc067f575057224
Bill Yi [Mon, 22 Jul 2019 19:51:28 +0000 (12:51 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
7d966975ad -s ours
am skip reason: subject contains skip directive
Change-Id: Ie9d71673049fc02897d6ce5c9c16b8e7cee8b0e6
Bill Yi [Mon, 22 Jul 2019 19:24:56 +0000 (12:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
04a6245af9 -s ours
am skip reason: subject contains skip directive
Change-Id: I59b9117b3767daeddfd91a10a490b46e4bb2b9d7
Bill Yi [Mon, 22 Jul 2019 17:59:39 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0369197f24082cadfbb6b3ac72d33243231090ac