OSDN Git Service
Raff Tsai [Wed, 24 Jul 2019 12:29:41 +0000 (05:29 -0700)]
Fix crash after uninstalling app
am:
637d419157
Change-Id: I4d482cfd7b427cfd8644ed31b717668886905fe6
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 03:50:22 +0000 (20:50 -0700)]
Merge "Add extra check for accessibility flow." into qt-r1-dev
am:
c563fbb979
Change-Id: Ie099ec3991ffb9f3bc2ef24737add7c23346ac43
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:15:59 +0000 (15:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
fe36dd6834 -s ours
am skip reason: subject contains skip directive
Change-Id: I3d8a274fba6c22008d45765b42f1bcb108445976
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:46:39 +0000 (09:46 -0700)]
Merge "Support new regulatory label for location" into qt-dev am:
28736bee5d
am:
c453af3f91
Change-Id: I1f3c517c6056c1a12a64a274bf81aef50abe2d97
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
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: I71fec74cc487b40a9cf167bff6cae060f309ef24
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:55:15 +0000 (16:55 -0700)]
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
am:
66b0cabf26
Change-Id: Iae76ee176083edefc6a8f6aab356751070689488
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 20:12:45 +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: I79e5367a2c5a2a084265462a01c332d0815cbf03
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:25:43 +0000 (12:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
04a6245af9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie51bb342d50b05a3f1d37572934effb4b4ab9b84
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)
Bill Yi [Fri, 19 Jul 2019 21:05:21 +0000 (14:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
efc7ac061c -s ours
am skip reason: subject contains skip directive
Change-Id: I8639aa47b9d68a975ebc3b5fb44319509e177188
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
TreeHugger Robot [Fri, 19 Jul 2019 17:55:47 +0000 (17:55 +0000)]
Merge "Use the Global value rather than the Secure value" into qt-r1-bubbles-dev
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
Antony Sargent [Fri, 19 Jul 2019 02:57:18 +0000 (19:57 -0700)]
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
am:
20ec6a4b6f
Change-Id: I512000e6041c3611d4c7715355d8564aa3261b01
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
Mady Mellor [Thu, 18 Jul 2019 21:13:05 +0000 (14:13 -0700)]
Use the Global value rather than the Secure value
Fixes:
137876221
Test: manual - have setting in dev options turned off, post a bubble
=> no bubble appears
- have setting in dev options turned on, post a bubble
=> bubble appears
Change-Id: I4490b978059a73b45fa8d09bf28e05965f42eec1
Bill Yi [Thu, 18 Jul 2019 21:37:11 +0000 (14:37 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e73e59c562 -s ours
am:
1f4b32a154 -s ours
am skip reason: subject contains skip directive
Change-Id: I23c9c5e6e8bdf6f59733d7fefbe658699ae997c4
Bill Yi [Thu, 18 Jul 2019 21:36:14 +0000 (14:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
56887f467c -s ours
am skip reason: subject contains skip directive
Change-Id: Ifdb15f70ca027f4a429dbf84d03a5b82096aaac7
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
Lyn Han [Thu, 18 Jul 2019 14:30:16 +0000 (14:30 +0000)]
Merge "Secure => global bubble settings pt 2" into qt-r1-bubbles-dev
Kevin Chang [Thu, 18 Jul 2019 07:44:44 +0000 (00:44 -0700)]
Merge "Add footer preference into caption preferences" into qt-r1-dev
am:
5fc6db2cf7
Change-Id: I66530a3acd24e227d3c659e03bed62db58d7fe92
Kevin Chang [Thu, 18 Jul 2019 07:43:52 +0000 (00:43 -0700)]
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
am:
6bfc381173
Change-Id: Ic7255bbfdb06c5a38073198073d37f3ba1207d4c
Kevin Chang [Thu, 18 Jul 2019 07:42:38 +0000 (00:42 -0700)]
Merge "UI change in caption preferences in Settings" into qt-r1-dev
am:
af447c17b8
Change-Id: Iba6562299043b23d2f3b5cbb06ed4ae23dede871
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
Lyn Han [Tue, 9 Jul 2019 21:58:11 +0000 (14:58 -0700)]
Secure => global bubble settings pt 2
Follow up to http://ag/
8222583
- Replace references to Secure.NOTIFICATION_BUBBLES with
Global.NOTIFICATION_BUBBLES
Fixes:
136034310
Bug:
129158983
Test: m RunSettingsRoboTests
Test: atest SystemUITests
Test: manual - work profile bubbles show up
Change-Id: Ifa71206353237b837cfcda6d23ea6a6ec2c146d0
Joshua Mccloskey [Mon, 15 Jul 2019 20:12:46 +0000 (13:12 -0700)]
Merge "Fixed Settings Crash" into qt-r1-dev
am:
800e8a485f
Change-Id: I06acbe8547a729b2522cfcd64830debc7a0905ef
Joshua Mccloskey [Mon, 15 Jul 2019 19:40:23 +0000 (19:40 +0000)]
Merge "Fixed Settings Crash" into qt-r1-dev
Lyn Han [Mon, 15 Jul 2019 18:43:44 +0000 (18:43 +0000)]
Merge "Revert "Secure => global bubble settings pt 2"" into qt-r1-bubbles-dev
Lyn Han [Mon, 15 Jul 2019 18:06:32 +0000 (18:06 +0000)]
Revert "Secure => global bubble settings pt 2"
This reverts commit
a978ab45262e2145d099c9f6b412675d6c1f69eb.
Reason for revert: fix test
Change-Id: Id6b49106ab7d8a42ea5de8b16a0dd3ed49d58817
TreeHugger Robot [Mon, 15 Jul 2019 18:04:34 +0000 (18:04 +0000)]
Merge "Secure => global bubble settings pt 2" into qt-r1-bubbles-dev
Bill Yi [Mon, 15 Jul 2019 08:28:12 +0000 (01:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
8d229d7090 -s ours
am:
09be23ffaa -s ours
am skip reason: subject contains skip directive
Change-Id: Ibe55cf198621fef719bb27d1d7773a724458dfda
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 [Mon, 15 Jul 2019 04:51:26 +0000 (21:51 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
941e94d689 -s ours
am skip reason: subject contains skip directive
Change-Id: I6e5471fb31bd2e5820f5f4930d33c016e99edd65
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
Lyn Han [Tue, 9 Jul 2019 21:58:11 +0000 (14:58 -0700)]
Secure => global bubble settings pt 2
Follow up to http://ag/
8222583
- Replace references to Secure.NOTIFICATION_BUBBLES with
Global.NOTIFICATION_BUBBLES
Fixes:
136034310
Bug:
129158983
Test: atest SystemUITests
Test: manual - work profile bubbles show up
Change-Id: I03ffd7f1126f2c20d819f741cd4f7dcced81a405
Andrew Sapperstein [Fri, 12 Jul 2019 03:59:39 +0000 (20:59 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev am:
1f942d9857
am:
44f731c1c7
Change-Id: I5f6f9c95d0495c09f3514e7356ed7409ffd9eb7e
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 21:56:08 +0000 (14:56 -0700)]
Ensure feature is supported and enabled.
am:
a96a84e256
Change-Id: Ie607b615a64665c91cccffc50901c8099c0413ca
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
joshmccloskey [Thu, 11 Jul 2019 21:05:56 +0000 (14:05 -0700)]
Update FaceSlice to use correct pref & FaceManager
am:
365beaebdb
Change-Id: If26b32c83bfbda5f6268985c4d8812ff25d76e05
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:16:27 +0000 (03:16 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
433e625341 -s ours
am:
3e9da03d0c -s ours
am skip reason: subject contains skip directive
Change-Id: Iad91c18121a564cc1ef7a6f0b704c16a7fa37c06
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 08:12:16 +0000 (01:12 -0700)]
Improve Settings launch performance am:
496d3f6f9c
am:
49d575b91c
Change-Id: I36d43b032a7ac815c680b1b875e0d7b5cf5e7e96
tmfang [Thu, 11 Jul 2019 07:54:14 +0000 (00:54 -0700)]
Improve Settings launch performance
am:
496d3f6f9c
Change-Id: I16eb11d8850cbd75dd3571d16fce5758e5280bfd
TreeHugger Robot [Thu, 11 Jul 2019 07:40:47 +0000 (07:40 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
Bill Yi [Thu, 11 Jul 2019 07:06:07 +0000 (00:06 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
fa674d85ae -s ours
am skip reason: subject contains skip directive
Change-Id: I4b932251009efe11f3fc0dbaf547aa25d15a45d8
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:45:25 +0000 (20:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia7da4c89d6e06b3d4dce7175a996decf1ea4af22
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:45:57 +0000 (19:45 -0700)]
Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
am:
0839185647
Change-Id: I3d79f210409ffbeea116882368f82abf218e6de7
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:28:50 +0000 (17:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
13d6e13166 -s ours
am:
49175304a4 -s ours
am skip reason: subject contains skip directive
Change-Id: I874777f8257c403ea12b844c273fded69cebd48e
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
Bill Yi [Wed, 10 Jul 2019 00:10:26 +0000 (17:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
41a7f9de31 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic3eb1d5258c1893b7b7e355216fc0d51ddce706b
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 23:05:43 +0000 (16:05 -0700)]
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
am:
007a1aee1b
Change-Id: Iff53397eed65d53a1cc53b01b85d9dab1f004ee3
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 [Tue, 9 Jul 2019 00:10:19 +0000 (17:10 -0700)]
Fix work account setup lock screen content for face auth
am:
5604585930
Change-Id: I4c17bde1aa4d4a07c2d9b4bb72fbc07832d1bd1f
TreeHugger Robot [Mon, 8 Jul 2019 21:27:57 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
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:13:54 +0000 (19:13 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
292e7ad110 -s ours
am:
ce4d5fbff9 -s ours
am skip reason: subject contains skip directive
Change-Id: If3c82155189da3a0564c2eb682eee98245e91e82
Bill Yi [Sat, 6 Jul 2019 02:09:11 +0000 (19:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
bad6060727 -s ours
am skip reason: subject contains skip directive
Change-Id: I2cd9425cab5d5da12695fd2d58c5335687f8ed3c
Bill Yi [Sat, 6 Jul 2019 02:08:40 +0000 (19:08 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icdaa795f233501177a08cdce04829dd97ded4e98
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 [Thu, 4 Jul 2019 00:16:33 +0000 (17:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
a0fb9000bb -s ours
am:
b038d65f4c -s ours
am skip reason: subject contains skip directive
Change-Id: I9ecb0c88a6ecd0b7feb5bcfbfa815b4da71a1df4
Mark Chien [Wed, 3 Jul 2019 23:37:08 +0000 (16:37 -0700)]
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
am:
8a44e4f274
Change-Id: I68703e3184557d1cd2597f0601a6e2fec1710c71