git.osdn.net Git - android-x86/packages-apps-Settings.git/commit

(root) / android-x86 / packages-apps-Settings.git / commit

author	Maurice Lam <yukl@google.com>
	Fri, 28 Apr 2017 23:18:47 +0000 (16:18 -0700)
committer	Maurice Lam <yukl@google.com>
	Fri, 12 May 2017 22:35:20 +0000 (15:35 -0700)
commit	2eb170cd6ff43db01dc0ff3c1fcac5ebba4489de
tree	6dc871a5692bdb9ee99bfa79befed631933ffc0a	tree \| snapshot
parent	1949776c599ffa4653b055571f57b06e84dd5ed4	commit \| diff

Clean up choose lock intent creation

Consolidated the many variants of ChooseLock*.createIntent, so that
it will take the same set of arguments.

Also modified SetupChooseLock*.createIntent to modifyIntentForSetup,
which will take the intent created by ChooseLock* and modify it for
use with setup.

Test: cd tests/robotests && mma
Change-Id: I5ff033f459c33ec9980872a536b3996d89f2bbbb

55 files changed:

AndroidManifest.xml		diff \| blob \| history
src/com/android/settings/CredentialStorage.java		diff \| blob \| history
src/com/android/settings/CryptKeeperSettings.java		diff \| blob \| history
src/com/android/settings/EncryptionInterstitial.java		diff \| blob \| history
src/com/android/settings/MasterClear.java		diff \| blob \| history
src/com/android/settings/ResetNetwork.java		diff \| blob \| history
src/com/android/settings/ScreenPinningSettings.java		diff \| blob \| history
src/com/android/settings/SecuritySettings.java		diff \| blob \| history
src/com/android/settings/Settings.java		diff \| blob \| history
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java		diff \| blob \| history
src/com/android/settings/accounts/AddAccountSettings.java		diff \| blob \| history
src/com/android/settings/applications/ConvertToFbe.java		diff \| blob \| history
src/com/android/settings/core/gateway/SettingsGateway.java		diff \| blob \| history
src/com/android/settings/development/DevelopmentSettings.java		diff \| blob \| history
src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java		diff \| blob \| history
src/com/android/settings/fingerprint/FingerprintEnrollBase.java		diff \| blob \| history
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java		diff \| blob \| history
src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java		diff \| blob \| history
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java		diff \| blob \| history
src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java		diff \| blob \| history
src/com/android/settings/fingerprint/FingerprintSettings.java		diff \| blob \| history
src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java		diff \| blob \| history
src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java		diff \| blob \| history
src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java		diff \| blob \| history
src/com/android/settings/password/ChooseLockGeneric.java	[moved from src/com/android/settings/ChooseLockGeneric.java with 92% similarity]	diff \| blob \| history
src/com/android/settings/password/ChooseLockPassword.java	[moved from src/com/android/settings/ChooseLockPassword.java with 92% similarity]	diff \| blob \| history
src/com/android/settings/password/ChooseLockPattern.java	[moved from src/com/android/settings/ChooseLockPattern.java with 95% similarity]	diff \| blob \| history
src/com/android/settings/password/ChooseLockSettingsHelper.java	[moved from src/com/android/settings/ChooseLockSettingsHelper.java with 97% similarity]	diff \| blob \| history
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java	[moved from src/com/android/settings/ConfirmDeviceCredentialActivity.java with 98% similarity]	diff \| blob \| history
src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java	[moved from src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java with 97% similarity]	diff \| blob \| history
src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java	[moved from src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java with 99% similarity]	diff \| blob \| history
src/com/android/settings/password/ConfirmLockPassword.java	[moved from src/com/android/settings/ConfirmLockPassword.java with 99% similarity]	diff \| blob \| history
src/com/android/settings/password/ConfirmLockPattern.java	[moved from src/com/android/settings/ConfirmLockPattern.java with 99% similarity]	diff \| blob \| history
src/com/android/settings/password/CredentialCheckResultTracker.java	[moved from src/com/android/settings/CredentialCheckResultTracker.java with 98% similarity]	diff \| blob \| history
src/com/android/settings/password/ManagedLockPasswordProvider.java	[moved from src/com/android/settings/ManagedLockPasswordProvider.java with 92% similarity]	diff \| blob \| history
src/com/android/settings/password/PasswordRequirementAdapter.java		diff \| blob \| history
src/com/android/settings/password/SaveChosenLockWorkerBase.java	[moved from src/com/android/settings/SaveChosenLockWorkerBase.java with 98% similarity]	diff \| blob \| history
src/com/android/settings/password/SetNewPasswordActivity.java		diff \| blob \| history
src/com/android/settings/password/SetNewPasswordController.java		diff \| blob \| history
src/com/android/settings/password/SetupChooseLockGeneric.java	[moved from src/com/android/settings/SetupChooseLockGeneric.java with 76% similarity]	diff \| blob \| history
src/com/android/settings/password/SetupChooseLockPassword.java	[moved from src/com/android/settings/SetupChooseLockPassword.java with 63% similarity]	diff \| blob \| history
src/com/android/settings/password/SetupChooseLockPattern.java	[moved from src/com/android/settings/SetupChooseLockPattern.java with 67% similarity]	diff \| blob \| history
src/com/android/settings/users/UserSettings.java		diff \| blob \| history
tests/app/src/com/android/settings/password/ChooseLockGenericTest.java	[moved from tests/app/src/com/android/settings/ChooseLockGenericTest.java with 98% similarity]	diff \| blob \| history
tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java	[moved from tests/app/src/com/android/settings/ConfirmLockPasswordTest.java with 97% similarity]	diff \| blob \| history
tests/robotests/assets/grandfather_not_implementing_indexable		diff \| blob \| history
tests/robotests/assets/grandfather_not_implementing_instrumentable		diff \| blob \| history
tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java	[new file with mode: 0644]	blob
tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java	[new file with mode: 0644]	blob
tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java	[moved from tests/robotests/src/com/android/settings/ConfirmCredentialTest.java with 72% similarity]	diff \| blob \| history
tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java		diff \| blob \| history
tests/unit/src/com/android/settings/password/ChooseLockSettingsHelperTest.java	[moved from tests/unit/src/com/android/settings/ChooseLockSettingsHelperTest.java with 99% similarity]	diff \| blob \| history

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help