Commit Graph

31 Commits

Author SHA1 Message Date
tmfang
dce94bb237 Use SettingsLib's LayoutPreference
- Remove LayoutPreference in Settings source code.
- Remove unused style, layout
- Replace old imports to com.android.settingslib.widget.LayoutPreference
- Replace old XML tag to com.android.settingslib.widget.LayoutPreference

Test: robotest, manual test
Bug: 120005054
Change-Id: I9ae1ae14a16f443e11ac5d75b6038c7c5e253844
2018-11-27 13:12:53 +08:00
Kevin Chyn
7d7ffda9ae Simplify preview logic
Fixes: 112564159
Bug: 119786386

Test: manual
Change-Id: I42fba5a53248193fbe820e710a863ec9de728d4a
2018-11-19 18:34:31 -08:00
Kevin Chyn
b4dcebec03 Use the correct manager to generate token
Bug: 111548037

Test: manual
Change-Id: I84f106ace988165f9f6dbc667c46302cbd1c6226
2018-11-16 15:58:02 -08:00
Kevin Chyn
0e11b18cf0 Merge changes from topic "biometric-cc"
* changes:
  3/n: Make CDCA transparent and add BiometricPrompt
  2/n: Add comments to launchConfirmationActivity parameters
  1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt
2018-11-02 00:37:24 +00:00
Kevin Chyn
e5a016e076 1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt
CDC is going to use BiometricPrompt instead. This change
removes FingerprintManager from CDC. BiometricPrompt
will show before pin/pattern/pass is shown.

Bug: 111461540

Test: modified BiometricPromptDemo to use
      KeyguardManager#createConfirmDeviceCredentialIntent,
Test: Fingerprint is gone from CDC, rotation works
Test: atest SettingsRoboTests

Change-Id: I9ce2aad71961af8a0d5ee636600e2fbdb6154e47
2018-11-01 14:11:57 -07:00
Kevin Chyn
66d09a42d9 Add android.settings.BIOMETRIC_ENROLL action intent
Fixes: 112925362

Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Change-Id: I8dc37520b290483dab46cee2f6ca8612f4cf870e
2018-10-31 18:07:07 -07:00
Yohei Yukawa
af4426bb65 Use ImeAwareEditText in FingerprintSettings
Like we did the same thing in the Settings app [1][2][3],
FingerprintSetting is another instance that should use
ImeAwareEditText to make sure InputMethodManager#showSoftInput() is
called after the EditText gains IME focus.

This approach should be more robust and easier to maintain than trying
to control the software keyboard visibility with
SOFT_INPUT_STATE_ALWAYS_VISIBLE, which is more complicated that people
think.

This CL also removes RenameDialog#mTextHadFocus since
RenameDialog#mDialogTextField is always focused when the dialog is
shown [4].

This CL also removes the following fields since they can just be a
local final variables that will be captured into callback.

 * RenameDialog#mFingerName
 * RenameDialog#mTextSelectionStart
 * RenameDialog#mTextSelectionEnd

 [1]: I182b05d3ff59fb3b4732d60d0d5a464f0e0e0235
      f6af093e2d
 [2]: I892d639f3cc5d43db553b682d5278b8ce2fe72da
      4803267106
 [3]: Ib75ba0f361b8b46c3b717cc1ffb864726958ed82
      b0bcbed372
 [4]: I5bb1b7227c1323595bf7f483e11e87e2c3550093
      7a1d52eb06

Fix: 118473687
Test: Manually verified as follows.
      1. Build and flash aosp_taimen-userdebug to Taimen
      2. Set up a fingerprint unlock.
      3. Rotate the device to landscape mode.
      4. Open Settings -> Security & location -> Fingerprint
      5. Re-enter password if necessary
      6. Tap "Finger 1"
      7. Make sure that AOSP Keyboard shows up
Change-Id: I2a137aa8f6a1ee2b67923bcf40e82320a56c7b59
2018-10-29 13:09:12 -07:00
Kevin Chyn
b0d9b8403a Proceed to "finish" page upon completing enrollment
Bug: 111548037

Test: manual
Change-Id: I1c0c5cc0eb2d1808221465c5eeba92e59b2cd572
2018-10-11 18:26:37 -07:00
Maurice Lam
7243a4016b Merge "Ignore lock type in ChooseLockGeneric in non-FBE" 2018-10-09 01:02:25 +00:00
Maurice Lam
446637e583 Ignore lock type in ChooseLockGeneric in non-FBE
We need to show the encryption opt-in in non-FBE cases.

Test: atest RunSettingsRoboTests
Bug: 115847373
Change-Id: I3a92b265c9c8ecf5d4af009943b5b9483e25a738
2018-10-05 13:30:55 -07:00
Kevin Chyn
2e50c32c80 Fix work profile fingerprint userId
Fixes: 117303349

Test: Enabling work profile, FP settings shows independent sets again
      (same as P behavior)

Change-Id: Ifddd41c8aaa4316a58c9b8d16905d6d05318f5fd
2018-10-05 11:23:59 -07:00
Kevin Chyn
d15bcdeb60 Do PackageManager check before getting system service
Fixes: 117074737

Test: Does not crash
Change-Id: I51b04f46f8d467c3a854c132415a2cad90b77203
2018-10-01 17:50:09 -07:00
Kevin Chyn
a8843f2959 Update FaceSettings to match mocks
Settings page should not show if device credential is not confirmed

Bug: 111548037
Fixes: 116531896

Test: adb shell settings get secure face_unlock_app_enabled
Test: make -j56 RunSettingsRoboTests

Change-Id: I651ee88e9ee4017ee3dc52fa8a5d05cb8f092e1d
2018-09-26 11:50:02 -07:00
Philip P. Moltmann
8a33bd5947 Merge "RestrictedLockUtils was split into ...Internal" 2018-08-31 04:47:28 +00:00
TreeHugger Robot
847865dca8 Merge "Update Settings to match Framework" 2018-08-31 01:21:07 +00:00
Philip P. Moltmann
e3f721132a RestrictedLockUtils was split into ...Internal
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
2018-08-30 08:11:39 -07:00
Kevin Chyn
76d40d3efb Update Settings to match Framework
Bug: 72825012
Test: atest SettingsRoboTests

Change-Id: Ie59347bcb5d6748b3e684541b390c8e5f6db3f4a
2018-08-28 21:45:01 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Kevin Chyn
e9117d9b95 7/n: Add enrollment animation
Fixes: 112005540

Test: Tested with ag/4749121

Change-Id: I7d51187f7b8b7a6c2c34c984740b76bc9fd89262
2018-08-14 22:22:53 -07:00
Kevin Chyn
6ec727914f Stop camera enumeration after finding first camera
The first one returned generally specifies the vendor's recommended
camera. We can also check lens focal length but it's not necessary.

Fixes: 112482387

Test: manual
Change-Id: Iab245f278ce1bf69ea95f7c081d20e837e84fe51
2018-08-13 18:33:24 -07:00
Kevin Chyn
22b4edd79e 6/n: Add camera preview to FaceEnrollEnrolling
Bug: 112005540

Test: manual
Change-Id: Ie4f810dffecdec9731e20d5756854d9c9f420f4b
2018-08-09 16:25:58 -07:00
Kevin Chyn
7189997bfa 5/n: Add face settings
This change connects the face status preference controller with the
settings fragment/activity. This change also implements the basic settings
page showing a video, a toggle for keyguard, improve/remove targets,
and footer.

Bug: 111321762

Test: manual
Change-Id: Ifc65f5acbf6551679074df63ef22ffba75229f37
2018-07-23 14:34:48 -07:00
Kevin Chyn
c01cb892b1 Merge "Fix settings crash after androidx refactoring" 2018-07-21 01:24:58 +00:00
Kevin Chyn
074fe1e473 Fix settings crash after androidx refactoring
Fixes: 111701576

Change-Id: I095d4837e7a34fb9f240f2a302b5c6f7d1142db9
Fixes: 111701576
2018-07-20 17:19:52 -07:00
tmfang
41ab6b4bf8 Migrate all AlertDialogs to AndroidX version
This CL only changed AlertDialog imports.
So, reviewer can review it easily.

Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes: 111413092
Test: This CL can't pass Robo test.
2018-07-20 11:32:13 +08:00
Fan Zhang
1b7ab5b40d Fix a crash when trying to find fingerprint sensor
Change-Id: I5bd237fde6d08ace7f8910808a88ba7b62610cba
Fixes: 111443778
Test: manual
2018-07-13 13:32:57 -07:00
tmfang
27c84de325 Settings Fragment Migration (Build pass app)
This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
2018-07-11 18:24:51 -07:00
tmfang
99cc23d0da Settings Fragment Migration (Change imports)
This commit *only* changes imports and optimize imports.
We don't do anything else.

This patch can't compile pass and run test case.
We will update other patches to fix these problem.

Change list.

1. import android.app.Fragment; ->
   import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
   import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
   import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
   import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
   import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
   import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
   import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
   import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
    import androidx.loader.app.LoaderManager.LoaderCallbacks;

Bug: 110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
2018-07-11 18:23:51 -07:00
Kevin Chyn
ea65b51a36 4/n: Add basic enrollment for Face
Bug: 110589286

Test: fingerprint enrolling still works
Test: enrollment flow with and without a pin set up still works properly
Test: enrollment continues when configuration changes, stops otherwise

Change-Id: I39f76c7f1a16e9533cef573f87cf4b81cb20cb18
2018-07-10 18:39:19 -07:00
Kevin Chyn
4882e875ae 1/n Start adding Face settings (base, intro)
This change refactors common biometric settings code as well to minimize
duplicated code in areas such as:
    Preference Controller
    EnrollBase
    EnrollIntro

This change also updates ChooseLock to have Face + Pin/Pattern/Pass

Bug: 110589286

Test: Fingerprint settings/enrollment still works
Test: make -j56 RunSettingsRoboTests
Change-Id: Ie35406a01b85617423beece42683ac086e9bc4a7
2018-06-29 18:19:34 -07:00
Kevin Chyn
871e55fc54 Move Fingerprint settings to biometrics/fingerprint
Bug: 110589286

Test: make -j56 RunSettingsRoboTests
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL still works
Test: adb shell am start -a android.settings.FINGERPRINT_SETUP still works
Change-Id: If33b557137cae7b57e4a0e906ee95032bc589436
2018-06-25 16:51:16 -07:00