Commit Graph

556 Commits

Author SHA1 Message Date
Wu Ahan
0067e9581b Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962

Change-Id: Ibe03950c9d6e02ebd641e93df2cb5cb646dbfb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 13:44:52 +00:00
Wu Ahan
3a2ef6db2f Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev 2023-03-22 03:46:30 +00:00
Ahan Wu
ae84ac3530 Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment
1. Use GlifLayout#setDescriptionText to align UX.
2. Remove redundant layout resources.
3. Add two new robotests.

Bug: 236948821
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SetupChooseLockGenericTest
Test: Check UI manually
Change-Id: I85cc984527fcc746e835d8fa508e78c96dfdcb94
2023-03-21 06:27:51 +00:00
Dmitry Dementyev
e9e48a5b95 Return GK_PW_HANDLE after remote LSKF verification.
Handle is returned when LSKF is set after successful verification.
It is used by SUW to add biometrics without asking for LSKF.

Bug: 272807192
Test: manual
Change-Id: I3fe6ed7fd6401421090ccd684509dfede9106076
2023-03-20 18:01:52 -07:00
Diya Bera
ed1bb20ff1 Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586

Change-Id: I190752b9c2a65024c140b7dab92524097c183ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 22:52:07 +00:00
Diya Bera
4ffddaa19f Remove subtitle from biometric prompt in Settings (Passwords & Accounts)
Bug: 250064171
Test: Manual - repro according to bug
Change-Id: I5896c3cec13d65093fa928db042952045269b93f
2023-03-15 04:17:50 +00:00
Pavel Grafov
e5d082b0dc Show work lock confirmation in a task overlay
WorkLockActivity is added on top of each task that has any work
activity when the profile is locked. This activity is a task
overlay meaning it stays on top of other activities. It then starts
ConfirmDeviceCredentialActivity, also as an overlay because
otherwise it will sink under WorkLockActivity. But when CDCA
launches CofirmLockPattern, it is not set as an overlay and as a
result is not visible. These CLs add a boolean extra to instruct
CDCA to launch CLP (or other activities) as an overlay.

Bug: 271840143
Bug: 234002331
Test: manual, with TestDPC setting password reset token.
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: Ie9b593696a24ad0c435b36eef80e3fe760c588ba
2023-03-13 14:49:57 +00:00
Dmitry Dementyev
1ab3fe5a9e Use updated lockscreen validation API in Settings.
Test: manual
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Bug: 269256333
Change-Id: I660dea98eace96ed241b0a90f12ddeb742381dc0
2023-03-08 22:09:25 +00:00
Avinash Vadlamudi
7da92e9295 [Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state
- Save and restore the autoPinConfirmOptionSetManually field during activity restart (because of orientation change)
- This helps to retain the state of the auto confirm unlock checkbox  during an orientation change during set PIN stage.

Bug: 268592440
Test: Manual Test
Test: atest ChooseLockPasswordTest
Change-Id: I48ce9080b6007fb4e3a5ca5013d6c21ed4ba664f
2023-02-28 11:54:16 +00:00
Avinash Vadlamudi
e644d26b95 [Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method
- The method isAutoPinConfirmFeatureAvailable is changed to static, so refactoring the code to use it properly.

Bug: 270315296
Test: Manual Test
Test: atest AutoPinConfirmPreferenceControllerTest
Test: atest ChooseLockPasswordTest
Change-Id: Idecaeca296b9ae9acdd0c094dcbb736db31b74b3
2023-02-23 05:56:58 +00:00
Brian Lee
d4f8e5802e Support remote device credentials validation in UI.
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Test: Manual
Bug: 258505917

Change-Id: Ifb9f15728eb8396b34c844d28f71a8e6e1aad837
2023-02-15 23:23:17 -08:00
Chengfei Tao
af1a9183fa Merge "Better biometric subtitle with createConfirmDeviceCredentialIntent() API" 2023-02-08 09:11:04 +00:00
Diya Bera
62a25bfb58 Merge "Remove background tint during SUW" into tm-qpr-dev am: 135041eab5 am: 8f2a74479a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21265617

Change-Id: I59aef62d50993776a25a9dcfab15d63f880b3298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 18:58:18 +00:00
Diya Bera
8f2a74479a Merge "Remove background tint during SUW" into tm-qpr-dev am: 135041eab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21265617

Change-Id: I673e399d2e40d9dec1b216901902645be022dd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 18:28:50 +00:00
Diya Bera
87567ceb5e Remove background tint during SUW
Test: Manual - navigate to the activity mentioned in the bug and observe
the background
Bug: 264993674

Change-Id: I21c8143099e4c76ed5744cff12f31f578320a871
2023-02-03 23:29:06 +00:00
Oli Thompson
08c0e13ece Merge "Add emergency call buttons to the work challenge screens in the case of managed subscription for work telephony" 2023-02-03 13:00:58 +00:00
Oli Thompson
cd3bbc6162 Add emergency call buttons to the work challenge screens in the case of
managed subscription for work telephony

Test: manually tested for now

Bug: b/258631630
Change-Id: I700d0408e3ffa86a595072b1a4aad62bac33b01d
2023-01-31 15:55:14 +00:00
Avinash Vadlamudi
4c8ad8f911 [Auto Pin Confirm]: Changes to allow PIN auto confirm feature to be controllable by the user
- Add SwitchPreference to allow user to control the pin auto confirm feature
- Add Checkbox option during the PIN setup in Security app
- Disable the opt-in checkbox during SUW entry point for PIN setup
- Update SwitchPreference availability appropriately according to current PIN length
- Update the pin_auto_confirm setting appropriately according to state of switchPreference or checkbox state (in PIN setup)
- Update the error-message when PIN Too short to let user know six digit is recommended

Bug: 262926000
Bug: 262936383
Bug: 262934702
Bug: 262935305
Test: Manual Test
Test: atest SettingsRoboTests
Change-Id: Ib9e09bd5ce44652158e77f80e8be19c4dd50f3bf
2023-01-30 14:35:41 +00:00
TreeHugger Robot
daa9003533 Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev am: 66e23eb89c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20877556

Change-Id: I1c14caa62062f58fa43ed0861d8f527ddcade3d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 04:29:04 +00:00
Bill Lin
81974ace76 Merge changes from topic "pattern-view-size" into tm-qpr-dev am: 3959e27ec1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454693

Change-Id: I69f420a942336d1fb589793662d1e700fa64b173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 08:11:01 +00:00
lbill
bbca300b30 5/ Refine SetupChooseLockPattern layout by design
Since the SetupChooseLockPattern include header icon
header title, header sub-title, pattern state description,
LockPatternView and FooterBar, there was a limited room
for LockPatternView especially in the confirm steps which
both header title and pattern description occupy 2 lines space.
Hance the PatternView size used to inconsistence in-between
1st draw and 2nd confirm draw, besides it's visual looks
jumping and small on some device which have smaller display.

This solution includes 3 changes:
1. Organized the pattern view message to leverage
   header sub-title view, then we can resever more space.
   (Set minHeight=2 for sub-title)
2. Set screen_lock_options button visibilty to GONE when
   the stage in 2nd confirmation.(Previously it's INVISIBLE
   and reserve additional space)
3. Let LockPatternView align bottom of FrameLayout to prevent
   the view juming and flicker.
4. Clean up unused forAnyBiometric flag and code.
5. GlifLayout.getDescriptionTextView() == mHeaderView
   Need setDescriptionText() to make the view from GONE -> VISIBLE
6. Polish the stage flow and ensure IntroductionStage show
   correct message
7. Add ChooseLockPattern into embeded activity white list
   Force show ChooseLockPattern in fullscreen in case the Pattern
   view truncated in `NeedToConfirmStage` where the title showing
   2 lines and push pattern view down, and get bad UX in the
   device which integrate a shorter display.
8. Add test cases for all stage and polish legacy test code.

Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
     "com.android.settings.password.SetupChooseLockPatternTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
     "com.android.settings.password.ChooseLockPatternTest"
Bug: 249974175
Bug: 260027850
Change-Id: I868af9b14ba99af5d78a05f6c2a570ccc07aea15
2023-01-09 05:30:33 +00:00
lbill
fbed9b87ce 3/ SUW lib Glif and theme add additional padding in sud_layout_content
Temporary remove the redundant padding from ChooseLockPattern and
ConfirmLockPattern as a workaround solution.

Bug: 243008023
Test: make and check visual on foldable
Test: make RunSettingsRoboTests
Change-Id: I0baa2be65b797ca70f9de43bc8c5e3187a2d28ad
Merged-In: I0baa2be65b797ca70f9de43bc8c5e3187a2d28ad
2023-01-09 05:30:33 +00:00
lbill
7135d36d37 5/ Refine SetupChooseLockPattern layout by design
Since the SetupChooseLockPattern include header icon
header title, header sub-title, pattern state description,
LockPatternView and FooterBar, there was a limited room
for LockPatternView especially in the confirm steps which
both header title and pattern description occupy 2 lines space.
Hance the PatternView size used to inconsistence in-between
1st draw and 2nd confirm draw, besides it's visual looks
jumping and small on some device which have smaller display.

This solution includes 3 changes:
1. Organized the pattern view message to leverage
   header sub-title view, then we can resever more space.
   (Set minHeight=2 for sub-title)
2. Set screen_lock_options button visibilty to GONE when
   the stage in 2nd confirmation.(Previously it's INVISIBLE
   and reserve additional space)
3. Let LockPatternView align bottom of FrameLayout to prevent
   the view juming and flicker.
4. Clean up unused forAnyBiometric flag and code.
5. GlifLayout.getDescriptionTextView() == mHeaderView
   Need setDescriptionText() to make the view from GONE -> VISIBLE
6. Polish the stage flow and ensure IntroductionStage show
   correct message
7. Add ChooseLockPattern into embeded activity white list
   Force show ChooseLockPattern in fullscreen in case the Pattern
   view truncated in `NeedToConfirmStage` where the title showing
   2 lines and push pattern view down, and get bad UX in the
   device which integrate a shorter display.
8. Add test cases for all stage and polish legacy test code.

Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
     "com.android.settings.password.SetupChooseLockPatternTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
     "com.android.settings.password.ChooseLockPatternTest"
Bug: 249974175
Bug: 260027850
Change-Id: I868af9b14ba99af5d78a05f6c2a570ccc07aea15
2023-01-07 19:36:47 +00:00
xinghailu
897fd74731 Cleanup some plurals in Settings
Change <one> to <1> in string res file, and update related java files.
Test: Update, existing test still pass.
bug: 199230342

Change-Id: Idd0ba3c6adc060da21574d98f8ed765fae00cef8
2022-12-22 16:05:13 +08:00
chengfeitao
3f0864af1b Better biometric subtitle with createConfirmDeviceCredentialIntent() API
Test: Tested manually with repro steps

Fixes: 224967328
Change-Id: I7e83392f5a2df3c258c07e77a9332b2cfde95225
2022-12-22 00:28:00 +00:00
Eric Biggers
5f1d894252 Remove EncryptionInterstitial for Full Disk Encryption
Support for Full Disk Encryption was removed in Android 13, since now
File Based Encryption is always used instead.  It turns out that I
missed a fairly large chunk of obsolete code: EncryptionInterstitial,
which is the screen that asks whether the device will require the
primary user's lockscreen credential when it starts up.  This used to be
shown when setting the primary user's lockscreen credential, to
determine whether the full-disk encryption key would be tied to that
lockscreen credential or not.  But now it's unused code.

This CL removes all this unused code.

This should not change any behavior, with one very minor exception:
Settings will no longer explicitly set the REQUIRE_PASSWORD_TO_DECRYPT
setting to 0 whenever the primary user's lockscreen credential is
changed.  (This happened in SaveChosenLockWorkerBase.)  This setting is
a @SystemApi, but it no longer has any meaning, since it is never set to
1 anymore.  If there is a reason to keep it explicitly set to 0, instead
of unset, we should make LockSettingsService in system_server set it.

Test: Went through SUW, set a PIN, cleared the PIN, set a PIN again (all
      using the UI).  Nothing unusual seen.
Bug: 208476087
Change-Id: I039cc7a284e3f43e1e284970a5869958c909d1b7
2022-12-15 20:47:20 +00:00
lbill
c2bfb4fbf3 3/ SUW lib Glif and theme add additional padding in sud_layout_content
Temporary remove the redundant padding from ChooseLockPattern and
ConfirmLockPattern as a workaround solution.

Bug: 243008023
Test: make and check visual on foldable
Test: make RunSettingsRoboTests
Change-Id: I0baa2be65b797ca70f9de43bc8c5e3187a2d28ad
2022-11-28 06:18:39 +00:00
Bonian Chen
7d507964e6 Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44 am: a0baef444d am: 5d2afa168a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406

Change-Id: Ib998f0407156c5f16aed4b0a977ec8f85e048560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 15:46:37 +00:00
Bonian Chen
a0baef444d Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406

Change-Id: I2f18c417aeae58959902c61946ebc44391445411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 14:42:02 +00:00
Bonian Chen
b5921fade9 [Settings] Enable ActivityResultLauncher for keyguard
Enable the support of ActivityResultLauncher for keyguard.

Bug: 260034791
Test: local
Change-Id: I0643241d7b79ba0ac4cd2314a126f33eb6557cc0
2022-11-23 12:48:34 +00:00
Oli Thompson
c30c7f5d58 Merge "Fix forgot password layout text alignment and change theme to show correct text colour in night mode Test: manual test Fixes: b/206761685" 2022-11-09 14:55:41 +00:00
Oli Thompson
cff34af3d4 Fix forgot password layout text alignment and change theme to show
correct text colour in night mode
Test: manual test
Fixes: b/206761685

Change-Id: Idccf40357a6b5f33ece89bc2772fa6ca51e4596a
2022-11-08 13:41:53 +00:00
lbill
526d5c692d Request hiding IME before starting next activity transition
Since legacy hideSoftInputFromWindow() for IME hiding animation
will be scheduled on the focus app's UI thread, so if activity
transition has running the animation on UI thread, the
IME hiding animation will be delayed until the animation finish.

Make sure calling WindowInsetsController#hide(ime()) before starting
activity transition to prevent flicker issue.

Bug: 204732064
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: SUW set/confirm pin and move to setup fingerprint(back and forth)
Test: make -j RunSettingsRoboTests

Change-Id: I33278dd5c993c0bc299ebd065011e5d18c7242e0
2022-10-31 03:16:14 +00:00
TreeHugger Robot
044887da8e Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dcdb am: d208da6546
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19553474

Change-Id: I815b5f1af564e64e73cbc352b7b1cd233bd64537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 02:23:35 +00:00
TreeHugger Robot
2cd733dcdb Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev 2022-08-12 01:19:01 +00:00
Milton Wu
98239c0da6 Add FLAG_SECURE for ChooseLockPassword and Pattern
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.

Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
      SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
2022-08-09 04:12:10 +00:00
Bill Lin
df8e07a9ae Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev am: 483c9b7206 am: 008f70c249
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394732

Change-Id: Idbae9c4f9b8a4f278c6e746a6df1fb2481349515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 01:35:33 +00:00
lbill
07b149ec51 Fix incorrect SetupChooseLockPattern layout
Root cause:
- The new added description TextView is too large
- sud_layout_description was add in sud_layout_content
  instead of sud_layout_header.

Solution:
- Set string lockpassword_choose_your_pattern_description
  to GlifLayout as it's description.(Header description)

Bug: 233666752
Fixes 239892091
Test: manual in setup flow, check choose lock pattern layouts
showing expectedly on both phone & tablet
Test: make RunSettingsRoboTests

Change-Id: Iabe503066434f8983dffb88d1c93f2bbf773b860
2022-07-25 12:01:46 +00:00
Eric Biggers
ff16ec8542 Use StorageManager.isFileEncrypted() instead of deprecated methods
Since emulated FBE is no longer supported, isFileEncryptedNativeOnly()
and isFileEncryptedNativeOrEmulated() are the same as the new method
isFileEncrypted().  Replace all calls to these deprecated methods in
this repository with isFileEncrypted().

Bug: 232458753
Change-Id: I95beea86ef771396c2e08f2d6a643fdc629ad89f
2022-06-10 17:42:38 +00:00
Ayush Sharma
6a9b989aea Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 03305ca22f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I9e4df9a8a64cd2ff168093c885aa917a1e326690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:51:36 +00:00
Ayush Sharma
695a47e469 Merge "Fix issue no action on clicking link in footer" into tm-dev 2022-05-11 12:56:44 +00:00
Ayush Sharma
d67cd2320e Fix issue no action on clicking link in footer
Links are not allowed in footer preference title now, so splitting the
string in to title text and learn more text for set a separate work
lock message

Bug: 206083998
Bug: 231296099
Test: NA
Change-Id: Ic19b4b7a9c8239726b1d53cecad1e341458610cb
2022-05-10 13:51:31 +01:00
Chaohui Wang
60866843ac Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: b8287d8aab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: Icecdd9ca733def83e4a61b7620909667aa5fc16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 05:02:21 +00:00
Chaohui Wang
9b28ecf9de Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev 2022-05-10 02:44:47 +00:00
Kholoud Mohamed
7bc2a481f8 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: 2e143c6324
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I54d30e2139abb3f4468d98c59058125a17bf28b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:22:38 +00:00
Kholoud Mohamed
155df044e5 Merge "Add missing settings strings." into tm-dev 2022-05-09 07:20:57 +00:00
Ayush Sharma
da44205ba9 Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 4b4f03efce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: Ia5853257881e0a313f8538f869b6f230f692bbc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:37:44 +00:00
Ayush Sharma
6e4579a816 Merge "Move set work lock message from header to footer" into tm-dev 2022-05-06 10:42:10 +00:00
kholoud mohamed
194fc00787 Add missing settings strings.
Bug: 226183482
Test: manual
Change-Id: I8efdff4531f31653ffb97c4aa485f49805c090b4
2022-05-06 09:34:54 +01:00
TreeHugger Robot
3de43826cb Merge "Add missing settings strings." into tm-dev am: af5a015198 am: b3130cd857 am: e4ebac3480 am: 844772713f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465

Change-Id: Ie359cdd4a2b8481319fe918ebff0478fe2877c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 14:52:43 +00:00