OSDN Git Service
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: Ia87ca65aaf5bf3f43c2d15b944bdf06a74f857c6
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: Ic653102f8f66c0f5e1e3457750cdf150f1dbfd5e
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
TreeHugger Robot [Mon, 29 Jul 2019 18:42:25 +0000 (18:42 +0000)]
Merge "Move channel listing into a pref controller" into qt-qpr1-dev
TreeHugger Robot [Mon, 29 Jul 2019 02:28:37 +0000 (02:28 +0000)]
Merge "Fix launching of work profile notif settings" into qt-qpr1-dev
Jason Chiu [Sat, 27 Jul 2019 01:44:26 +0000 (18:44 -0700)]
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
am:
04ad8c905a
Change-Id: I2c87041fb5575dfd621f4a9539653342c75d544f
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:15:41 +0000 (18:15 -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: I14cf7941c761c973d6c9297d366c213aeae4cbcf
Kevin Chyn [Sat, 27 Jul 2019 01:14:19 +0000 (18:14 -0700)]
Add ability to finish() ConfirmDeviceCredential if it loses foreground
am:
e27a304b97
Change-Id: Ie695769418adfd316d608a2e23ed45e7237d28ce
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 [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:30 +0000 (12:35 -0700)]
Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
am:
ba4fad160d
Change-Id: Ie71d66f43e21821b0ccac003d02878f011e63f18
Julia Reynolds [Mon, 1 Jul 2019 17:44:39 +0000 (13:44 -0400)]
Move channel listing into a pref controller
And a hidden preference category. This makes
hiding/showing the list a lot cleaner and also allows more
of the code to be tested.
Also delete some unused code that no longer complied after
this refactor.
Fixes:
133443871
Test: atest
Change-Id: I4a5fe0e075019bae2df44a0a9dcec26a40ee6d12
(cherry picked from commit
a295d71c94fbf9411f6ee6062de39aa34a574375)
Julia Reynolds [Wed, 12 Jun 2019 15:39:39 +0000 (11:39 -0400)]
Fix launching of work profile notif settings
Test: manual
Fixes:
132289017
Change-Id: I3c177aae1f4dd46556b652253d24b225d01987eb
(cherry picked from commit
142920e0c228427000a46e13aa2945796f2ef626)
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:30 +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: I3dabad25e5640239b491c864a999156156e77552
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:25:14 +0000 (17:25 -0700)]
Remove prerelease driver option from Settings UI. am:
c2dfba01ca
am:
7c5bb0ecda
Change-Id: Icfe7daa49feffd7b46b887d41e34615c8c0df6f9
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:40 +0000 (05:20 -0700)]
Fix crash after uninstalling app
am:
637d419157
Change-Id: Ib68843298dfcb71de6198a988f153397aabeb7f3
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:49:40 +0000 (21:49 -0700)]
Merge "Add extra check for accessibility flow." into qt-r1-dev
am:
c563fbb979
Change-Id: I0d84937b8029a8bdcec920123501fcb81f99f02f
Joshua Mccloskey [Tue, 23 Jul 2019 23:54:38 +0000 (23:54 +0000)]
Merge "Add extra check for accessibility flow." into qt-r1-dev
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
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
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
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
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 17:59:39 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0369197f24082cadfbb6b3ac72d33243231090ac
Bill Yi [Mon, 22 Jul 2019 17:37:18 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If2b98e7c7fadad3c2fb18275ed458da76e9cc7ac
Sunny Shao [Fri, 12 Jul 2019 09:19:41 +0000 (17:19 +0800)]
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
162e88c262055b9e8bca20833dee1f5ebdb540a5)
Yanting Yang [Thu, 18 Jul 2019 17:46:36 +0000 (01:46 +0800)]
Support new regulatory label for location
Fixes:
137348817
Test: visual, robotests
Change-Id: I165b1e859891c7897e837d82702582458cecbb0d
Bill Yi [Fri, 19 Jul 2019 17:23:51 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9ce6d671fe6587af26ea31b711da0d4594433ee6
TreeHugger Robot [Fri, 19 Jul 2019 02:26:19 +0000 (02:26 +0000)]
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
Mehdi Alizadeh [Thu, 18 Jul 2019 22:27:05 +0000 (15:27 -0700)]
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
Bill Yi [Thu, 18 Jul 2019 21:24:35 +0000 (14:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e73e59c562 -s ours
am skip reason: subject contains skip directive
Change-Id: I888c9b99282dcccfe58db799c1c02ceed4b63747
Bill Yi [Thu, 18 Jul 2019 18:28:21 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idb389ab591b291cae86749badc8d7cef2052e388
Bill Yi [Thu, 18 Jul 2019 18:07:45 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id43eff8bedf9c1bd2d3d25a73a560705ab8da213
Kevin Chang [Thu, 18 Jul 2019 06:59:47 +0000 (06:59 +0000)]
Merge "Add footer preference into caption preferences" into qt-r1-dev
Kevin Chang [Thu, 18 Jul 2019 06:59:45 +0000 (06:59 +0000)]
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
Kevin Chang [Thu, 18 Jul 2019 06:59:41 +0000 (06:59 +0000)]
Merge "UI change in caption preferences in Settings" into qt-r1-dev
Kevin Chang [Mon, 1 Jul 2019 06:51:36 +0000 (14:51 +0800)]
Add footer preference into caption preferences
Add footer preference into caption preferences to tell users
that the setting doesn't support all apps.
Reference link of screenshot:
https://drive.google.com/file/d/1VzpWa4M-4HjlfjDNNqrEIKwo3v0y_f51/view?usp=sharing
Bug:
135888603
Test: Visual
Change-Id: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
Merged-In: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
(cherry picked from commit
8f4b8b9a744ff139bcc4ff1763c9fb5c8337280a)
Kevin Chang [Tue, 18 Jun 2019 07:18:23 +0000 (15:18 +0800)]
Add new reminder in "Magnify with shortcut" page
Add new reminder string in "Magnify with shortcut" page when
it's under gesture navigation mode.
Reference link of screenshot:
https://drive.google.com/file/d/1uo31FZebhXKcCR8QY_WrgEPiInzARmIl/view?usp=sharing
Bug:
134645913
Test: Visual
Change-Id: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
Merged-In: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
Kevin Chang [Thu, 23 May 2019 06:30:23 +0000 (14:30 +0800)]
UI change in caption preferences in Settings
Move the switch after the caption preview and change the oreder of the
settings inside in caption preferences in Accessibility settings.
Reference link for screenshot:
https://drive.google.com/file/d/1EQLpfQFnJTwU1F8vLAOSHPYqSXKWL_ap/view?usp=sharing
Bug:
130755332
Test: Visual
Change-Id: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
Merged-In: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
(cherry picked from commit
fd1f1c0f82f046a1f250e96ce221aa29b4984c5a)
Antony Sargent [Tue, 16 Jul 2019 00:11:19 +0000 (17:11 -0700)]
Make MobileNetworkActivity support onNewIntent
The launchMode for MobileNetworkActivity specified in the android
manifest is "singleTask", which means that when an intent to it is
launched, if there is an existing instance we will reuse that instead of
creating a new one. But to handle this properly we need to know when it
happens by implementing onNewIntent, which we weren't doing.
Implementing this fixes a bug we noticed that if you have multiple SIMs
and recently visit the details page for SIM 1 but then click on a SIM
selection notification that should bring you to the details for SIM 2,
we'd just bring up the details page for SIM 1 again.
Fixes:
133447239
Test: make RunSettingsRoboTests
Change-Id: Ia9106b15ffde437f6dd6fd2da23336ec5b28f75e
Joshua Mccloskey [Mon, 15 Jul 2019 19:40:23 +0000 (19:40 +0000)]
Merge "Fixed Settings Crash" into qt-r1-dev
Bill Yi [Mon, 15 Jul 2019 08:21:17 +0000 (01:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8d229d7090 -s ours
am skip reason: subject contains skip directive
Change-Id: I4989ac93f690299f130945cc4b2ae4984974345f
Bill Yi [Mon, 15 Jul 2019 05:26:37 +0000 (22:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9ecaff62cfd0370a1ff7e5f6eb36a871c8486dee
Bill Yi [Sun, 14 Jul 2019 05:19:58 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id33f437d9b802519be1544de7616b3a5b0528680
joshmccloskey [Fri, 12 Jul 2019 20:17:37 +0000 (13:17 -0700)]
Fixed Settings Crash
Fixes:
137319680
Test: Manual
Change-Id: I0e22bd561787b1a141bf2e3060b23fe70a6d96ce
Andrew Sapperstein [Fri, 12 Jul 2019 03:51:32 +0000 (20:51 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev
am:
1f942d9857
Change-Id: I44e11b7a63c329883b01dc03f820e807c15953cf
Andrew Sapperstein [Fri, 12 Jul 2019 03:13:39 +0000 (03:13 +0000)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev
joshmccloskey [Thu, 11 Jul 2019 20:08:02 +0000 (13:08 -0700)]
Ensure feature is supported and enabled.
Fixes:
137285390
Test: Verified that SecuritySettings no longer crashes.
Test: Verified that this PrefenceController no longer shows up
if the device does not support it.
Test: Verified that this PreferenceController no longer
shows up when the work profile is disabled.
Change-Id: I10f015e18491b203db6f942f07034d55f620cfe5
Antony Sargent [Thu, 11 Jul 2019 18:04:09 +0000 (11:04 -0700)]
Fix erasing of eSIMs for some devices
Doing a factory data reset used to always erase eSIMs. Then a few months
ago we added a default-on checkbox to let users opt out of erasing the
eSIM during this process, but only had it show for some devices (ones
which support the "fastboot oem esim_erase" command) by adding a system
property named masterclear.allow_retain_esim_profiles_after_fdr.
When recently updating the strings shown in the factory data reset
screen and the confirmation dialog, we changed the code so that if that
the checkbox is hidden we'll pass false for the ERASE_ESIMS_EXTRA
parameter sent to the factory data reset confirmation dialog. This had
the unintended side effect of making devices that don't specify true for
masterclear.allow_retain_esim_profiles_after_fdr skip erasing the eSIM.
This CL fixes that by removing the "is the checkbox hidden" check, going
back to the previous behavior of just using the checkbox value, which is
on by default even if hidden.
Fixes:
135284765
Test: make RunSettingsRoboTests
Change-Id: Ia9f335920e4e3c4a90f0a6a49d1722a0c19ea83d
joshmccloskey [Tue, 9 Jul 2019 22:34:55 +0000 (15:34 -0700)]
Update FaceSlice to use correct pref & FaceManager
Fixes:
137137134
Test: Manual.
Change-Id: Idc707a7d2009975f81902867e4c37a8ee5775700
Bill Yi [Thu, 11 Jul 2019 10:10:27 +0000 (03:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
433e625341 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic5c4e1030a1f9907e3274be1a14c49d30783d839
TreeHugger Robot [Thu, 11 Jul 2019 09:54:20 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
tmfang [Thu, 11 Jul 2019 07:54:14 +0000 (00:54 -0700)]
Improve Settings launch performance
am:
496d3f6f9c
Change-Id: I16eb11d8850cbd75dd3571d16fce5758e5280bfd
tmfang [Wed, 3 Jul 2019 12:44:42 +0000 (20:44 +0800)]
Improve Settings launch performance
From traces analysis, we found getFreeBytes
was taking a long time to return.
getFreeBytes was used when storage controller
tried to get storage information.
In order to prevent this case, we put the action
which takes too much time in background thread.
Test: I can't reproduce it locally. From code view,
this is a reasonable root cause.
Fixes:
136268875
Change-Id: I78e42cde88553c003f198cffb5747b352055f59a
(cherry picked from commit
0c37f019f61f37b67e2297e99d96e8396d962f40)
Bill Yi [Thu, 11 Jul 2019 03:08:17 +0000 (20:08 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I67ba6e489c14dc511d485a4895c9e12fce1c3ee1
Bill Yi [Thu, 11 Jul 2019 02:31:11 +0000 (19:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I09ed37fffcf0bbcf61cdfa0b1f8cf22f5828d23b
Joshua Mccloskey [Wed, 10 Jul 2019 02:29:45 +0000 (02:29 +0000)]
Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
* changes:
Favor setup face in search settings.
Remove highlighting for work profile
Bill Yi [Wed, 10 Jul 2019 00:16:02 +0000 (17:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
13d6e13166 -s ours
am skip reason: subject contains skip directive
Change-Id: I9cadf1b43bc055fffa72a6bb96f929c5e5ed28dc
TreeHugger Robot [Tue, 9 Jul 2019 23:10:22 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
joshmccloskey [Tue, 9 Jul 2019 22:28:05 +0000 (15:28 -0700)]
Favor setup face in search settings.
Test: Manual.
Fixes:
137135217
Change-Id: I5e0a72a117e2af6d9262d07616cc539ee7a7e55e
TreeHugger Robot [Tue, 9 Jul 2019 22:24:00 +0000 (22:24 +0000)]
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
joshmccloskey [Tue, 9 Jul 2019 22:23:37 +0000 (15:23 -0700)]
Remove highlighting for work profile
Test: Manual.
Fixes:
137126517
Change-Id: Iefcbf498cc0805cd130981e522177a7c16b7adfc
Bill Yi [Tue, 9 Jul 2019 19:31:21 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I84335ed2cdca77f9f506c084b11c5bb3215dd05f
joshmccloskey [Tue, 9 Jul 2019 18:52:01 +0000 (11:52 -0700)]
Diversity extra no longer gets overwritten.
Test: Manual.
Fixes:
136963876
Change-Id: Ia62e7ac1ff942fa078a2fd5f1d7efc339132aaa3
Bill Yi [Tue, 9 Jul 2019 18:46:23 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1c15e397059f357be547ce32fcdbae885bff5925
Curtis Belmonte [Mon, 8 Jul 2019 18:23:28 +0000 (11:23 -0700)]
Fix work account setup lock screen content for face auth
For devices which provide biometric authentication options, such as
fingerprint or face, we should be showing different content on the lock
setup screen during the corp account setup wizard. Namely, the title
should read "Choose screen lock", and the "Not now" option should be
changed to "Continue without [auth method]". However, we currently only
check for whether fingerprint authentication is available, leading to
incorrect text for devices with face authentication.
This CL fixes the issue by changing the introducing a private method to
check for any biometric authentication (currently just mForFingerprint ||
mForFace). It then uses this method in place of the existing
mForFingerprint checks in SetupChooseLockGeneric.
Test: On a device with fingerprint auth and one with face auth:
1. Set a work profile with TestDPC and add some password quality requirement
2. adb shell settings put global device_provisioned
3. adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
4. Verify that the correct content is now shown (screenshot/xZPVtpa3j3Z)
5. Verify that setting lock with and without biometric auth still works
Fixes:
136556653
Change-Id: I46d3c964f05986aa97cc8ed77fe0ac125337ddd0
Bill Yi [Sat, 6 Jul 2019 02:04:54 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
292e7ad110 -s ours
am skip reason: subject contains skip directive
Change-Id: I1957817bdae8c4294cc6cc144a4dafea472004a6
Bill Yi [Fri, 5 Jul 2019 23:53:24 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9933f3eb0721fab73ff7776324de6ce088469a67
Bill Yi [Fri, 5 Jul 2019 21:38:28 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e
Bill Yi [Wed, 3 Jul 2019 23:24:44 +0000 (16:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
a0fb9000bb -s ours
am skip reason: subject contains skip directive
Change-Id: I6a45fa6f274773e72385e7e1f8356b7e7ad68995
Mark Chien [Wed, 3 Jul 2019 13:16:03 +0000 (13:16 +0000)]
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
TreeHugger Robot [Wed, 3 Jul 2019 07:21:59 +0000 (07:21 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Wed, 3 Jul 2019 06:30:20 +0000 (23:30 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41
Bill Yi [Wed, 3 Jul 2019 02:46:11 +0000 (19:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9ea845510ab634d146f09f885ab0de8cd789c325
Kevin Chyn [Wed, 3 Jul 2019 02:07:49 +0000 (02:07 +0000)]
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
Bill Yi [Mon, 1 Jul 2019 19:27:35 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6ab947284694fa3922d185f58f57c5acfd83b2ee
Robert Snoeberger [Mon, 1 Jul 2019 17:19:27 +0000 (17:19 +0000)]
Merge "Remove "clocks" from string" into qt-r1-dev
Robert Snoeberger [Thu, 27 Jun 2019 21:06:44 +0000 (17:06 -0400)]
Remove "clocks" from string
Fixes:
136193731
Bug:
136090066
Test: manual
Change-Id: I63751bb31016754930a4773d791f118103026ada
TreeHugger Robot [Mon, 1 Jul 2019 11:52:33 +0000 (11:52 +0000)]
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
Bill Yi [Mon, 1 Jul 2019 09:45:08 +0000 (02:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
26a2694bd3 -s ours
am skip reason: subject contains skip directive
Change-Id: I2c38c37556229f6ce9ac6acbbd5367bd239ff1ff
TreeHugger Robot [Mon, 1 Jul 2019 09:35:04 +0000 (09:35 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Pasty Chang [Mon, 1 Jul 2019 01:20:54 +0000 (01:20 +0000)]
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
Bill Yi [Sun, 30 Jun 2019 22:39:46 +0000 (15:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If33daab9a7d9e2c88b602147d66da40968412de6
Bill Yi [Sun, 30 Jun 2019 21:58:27 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I047beafb83c4c8df261fb5ac7c49dd81cb4470e0
TreeHugger Robot [Sat, 29 Jun 2019 10:57:45 +0000 (10:57 +0000)]
Merge "Add summary for white balance feature" into qt-r1-dev