Yanting Yang
dfeb1f07bb
Fix the clicking issue of restricted info icon
...
When the switch controller was disabled by admin, we will show the
restricted info icon on it and when user click this icon, it should pop
a dialog to notify user current action not allowed.
This issue was caused by the solution of fixing the a11y view focus
issue b/124334500, it has been disabled the focusable and clickable
attributes of icon then to block the dialog showing.
Recover the focusable and clickable of restricted info icon to fix it.
Fixes: 136439565
Test: visual, robotests
Change-Id: I227add696870e07feca288073e90afa8e76954ee
2019-07-11 10:05:41 +00:00
Curtis Belmonte
c29bf8d9cc
Fix work account setup lock screen content for face auth am: 5604585930
...
am: 209c049dca
Change-Id: Id5f58f33fcb3217833537fc6ccd6c7fc17e0ecc9
2019-07-08 17:30:53 -07:00
Curtis Belmonte
209c049dca
Fix work account setup lock screen content for face auth
...
am: 5604585930
Change-Id: Id6044f31b68d7b36a40b165be639bc58cc0e8b33
2019-07-08 17:10:55 -07:00
Curtis Belmonte
5604585930
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
2019-07-08 19:03:56 +00:00
TreeHugger Robot
c9197ed237
Merge "Import translations. DO NOT MERGE"
2019-07-06 03:32:37 +00:00
Bill Yi
8e2bf7ed8c
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110
-s ours am: ce4d5fbff9
-s ours
...
am: 34cf96e241
-s ours
am skip reason: subject contains skip directive
Change-Id: I602890af2a4e4d44dbce6f613173e11097d9efd8
2019-07-05 19:23:32 -07:00
Bill Yi
7646dcd383
[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110
-s ours am: 2759932e72
-s ours
...
am: f169d0de87
-s ours
am skip reason: subject contains skip directive
Change-Id: Iccbb2f8532805bc93b477e6edc9422e7b4f115ec
2019-07-05 19:22:56 -07:00
Android Build Merger (Role)
34cf96e241
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110
-s ours am: ce4d5fbff9
-s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-06 02:14:07 +00:00
Bill Yi
bbc3b2d55f
[automerger skipped] Import translations. DO NOT MERGE am: bad6060727
-s ours
...
am: cd3a5441b6
-s ours
am skip reason: subject contains skip directive
Change-Id: Id3affcf44eade46ce3031e8f456a688b456dc4e5
2019-07-05 19:13:54 -07:00
Bill Yi
bb0b72a1d9
[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110
-s ours
...
am: ce4d5fbff9
-s ours
am skip reason: subject contains skip directive
Change-Id: I45dae3a5c23a32b625a44025d4e47597e49d6789
2019-07-05 19:13:54 -07:00
Bill Yi
f169d0de87
[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110
-s ours
...
am: 2759932e72
-s ours
am skip reason: subject contains skip directive
Change-Id: I716345ea2e5b8e8d899d320ff2b8317b8bccf971
2019-07-05 19:13:53 -07:00
Bill Yi
ce4d5fbff9
[automerger skipped] Import translations. DO NOT MERGE
...
am: 292e7ad110
-s ours
am skip reason: subject contains skip directive
Change-Id: I1957817bdae8c4294cc6cc144a4dafea472004a6
2019-07-05 19:04:54 -07:00
Bill Yi
cd3a5441b6
[automerger skipped] Import translations. DO NOT MERGE
...
am: bad6060727
-s ours
am skip reason: subject contains skip directive
Change-Id: I6a587003900358aeddf32eac184668f483a381b1
2019-07-05 19:04:54 -07:00
Bill Yi
2759932e72
[automerger skipped] Import translations. DO NOT MERGE
...
am: 292e7ad110
-s ours
am skip reason: subject contains skip directive
Change-Id: I10718d202f97e6fb1d6c7855c50ae5e15d4e5278
2019-07-05 19:04:54 -07:00
Bill Yi
bad6060727
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9933f3eb0721fab73ff7776324de6ce088469a67
2019-07-05 16:53:24 -07:00
Bill Yi
292e7ad110
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e
2019-07-05 14:38:28 -07:00
Bill Yi
9471cb6e89
Import translations. DO NOT MERGE
...
Change-Id: I268be769ac7d65c7b87eed1067afa963c9fe62f7
Auto-generated-cl: translation import
2019-07-05 12:23:56 -07:00
TreeHugger Robot
aa05d1d780
Merge "Fix robolectric test error"
2019-07-05 09:53:37 +00:00
TreeHugger Robot
9848b293b0
Merge "Add margin between password entry and error text"
2019-07-05 07:52:56 +00:00
Raff Tsai
4d70be899d
Fix robolectric test error
...
Fixes: 136778642
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.deviceinfo"
Change-Id: I55591ec44397c39e71de7503c37ec84bbc17bfb1
2019-07-05 15:06:32 +08:00
Raff Tsai
e8bd78e212
Add margin between password entry and error text
...
Fixes: 130664317
Test: visual
Change-Id: Iefdbd39b94a861736baf8e9a302fbf651a5b14d3
2019-07-05 10:56:15 +08:00
Pasty Chang
834ee12237
Merge "Remove attribute colorError from settings glif theme"
2019-07-04 11:04:52 +00:00
TreeHugger Robot
355bb4d783
Merge "Improve Settings launch performance"
2019-07-04 09:42:23 +00:00
TreeHugger Robot
fae6799624
Merge "Fix nevigation up to wrong place"
2019-07-04 08:29:53 +00:00
tmfang
0c37f019f6
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
2019-07-04 16:09:34 +08:00
TreeHugger Robot
79cf1bb06c
Merge "Separate long press timeout preference controller form accessibility"
2019-07-04 08:08:27 +00:00
Sunny Shao
600ba96eea
Fix nevigation up to wrong place
...
Remove the parentActivityName attribute of the Settings$ManageDomainUrlsActivity
in the manifest.xml.
Fixes: 136686496
Test: manual
Change-Id: I99587dc99eea7fd2a22f11b839033e841eadb411
2019-07-04 11:52:59 +08:00
Raff Tsai
7f740e2064
Merge "Fix robolectric test failure"
2019-07-04 03:03:41 +00:00
Bill Yi
ebeb9e185e
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb
-s ours am: b038d65f4c
-s ours
...
am: fa99f72ad3
-s ours
am skip reason: subject contains skip directive
Change-Id: I3eb7b13f25e93aa13a70bcc9f97c59438d7f3093
2019-07-03 19:38:54 -07:00
pastychang
9ad817d503
Remove attribute colorError from settings glif theme
...
The attribute colorError has set in glif theme of setupdesign library. Remove it from
settings glif theme to avoid it overriden.
Bug: 128399555
Test: Manual
Change-Id: I08aa1053a6eb21b014246dcd116d7b2f4b7413e1
2019-07-04 02:30:08 +00:00
Mark Chien
5cc68af9ca
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev am: 8a44e4f274
...
am: 649f98541a
Change-Id: I226fff13988a87780cbf7c042619c36efcbae63f
2019-07-03 19:21:40 -07:00
Raff Tsai
d7b5583e19
Fix robolectric test failure
...
Fixes: 136660042
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core.codeinspection.CodeInspectionTest"
Change-Id: I348f70d348b61676c04bc384e99c6e71c73eaa26
2019-07-04 01:56:11 +00:00
Bill Yi
34eba28f51
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb
-s ours am: 479df9b529
-s ours
...
am: dbd5065d5b
-s ours
am skip reason: subject contains skip directive
Change-Id: I54f0c0190cce450d4da10e75316d4abfd814770a
2019-07-03 17:55:31 -07:00
Bill Yi
fa99f72ad3
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb
-s ours
...
am: b038d65f4c
-s ours
am skip reason: subject contains skip directive
Change-Id: Id68bae980aaf0d4d3d041efd2b6cba17f1a1d09c
2019-07-03 17:36:47 -07:00
Bill Yi
e06bee0fc3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 246873db8e
-s ours
...
am: 9dc4eb1470
-s ours
am skip reason: subject contains skip directive
Change-Id: I9c53a676a51bf41ee7e64adb032a025a11f33837
2019-07-03 17:28:33 -07:00
Mark Chien
649f98541a
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
...
am: 8a44e4f274
Change-Id: Ifabc853b754fd6323e01246613656fe72961c253
2019-07-03 17:19:49 -07:00
Bill Yi
dbd5065d5b
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb
-s ours
...
am: 479df9b529
-s ours
am skip reason: subject contains skip directive
Change-Id: I8562829647339c35d2b33b6952e2955a878cd4d7
2019-07-03 16:48:28 -07:00
Bill Yi
9dc4eb1470
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 246873db8e
-s ours
am skip reason: subject contains skip directive
Change-Id: Id9f406526e0a1a2e5263706a09bb4427a49dea6c
2019-07-03 16:42:04 -07:00
Kevin Chyn
ef8f844969
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev am: 47593cd29b
...
am: d40d9887f9
Change-Id: Ieb9522aaf393b8eeb14229b7dd907ad27a98a1eb
2019-07-03 16:30:32 -07:00
Bill Yi
b038d65f4c
[automerger skipped] Import translations. DO NOT MERGE
...
am: a0fb9000bb
-s ours
am skip reason: subject contains skip directive
Change-Id: I6a45fa6f274773e72385e7e1f8356b7e7ad68995
2019-07-03 16:24:44 -07:00
Bill Yi
479df9b529
[automerger skipped] Import translations. DO NOT MERGE
...
am: a0fb9000bb
-s ours
am skip reason: subject contains skip directive
Change-Id: I53bbafb3bcf25c01d4b1bc45edb66398ca900e91
2019-07-03 16:19:58 -07:00
Kevin Chyn
d40d9887f9
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
...
am: 47593cd29b
Change-Id: I093dcaa95180a22d05f91af645e82f588f09864b
2019-07-03 16:14:47 -07:00
Mill Chen
d2d1801e3b
Separate long press timeout preference controller form accessibility
...
Bug: 135056871
Test: manual, robotests
Change-Id: If49e4336b3461ec2a9568b8652c5aab0ff64ecfe
2019-07-03 21:27:34 +08:00
Mark Chien
8a44e4f274
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
2019-07-03 13:16:03 +00:00
Mill Chen
08c4c4aadd
Separate shortcut preference controller form accessibility
...
Bug: 135056871
Test: manual, robotests
Change-Id: I1dc61d50f46dfbd9bbd6fa33ecbc03157427d0b1
2019-07-03 20:15:09 +08:00
TreeHugger Robot
246873db8e
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-03 07:21:59 +00:00
Bill Yi
a0fb9000bb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41
2019-07-02 23:30:20 -07:00
Bill Yi
0b2b3a0ded
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ea845510ab634d146f09f885ab0de8cd789c325
2019-07-02 19:46:11 -07:00
Kevin Chyn
47593cd29b
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
2019-07-03 02:07:49 +00:00
Neil Fuller
78a7facc02
Merge "Add tobiast@ to the OWNERS file" am: a931693721
am: 46e53e770c
am: bf673318f1
...
am: e13cd91161
Change-Id: I3cc978431a8fe0e01522e12842c44b0d99b135a8
2019-07-02 17:36:47 -07:00