Merge "Misc clean up." (277ec1b9) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -133,15 +133,10 @@ public class SettingsActivity extends SettingsBaseActivity
		":settings:show_fragment_title_res_package_name";
		public static final String EXTRA_SHOW_FRAGMENT_TITLE_RESID =
		":settings:show_fragment_title_resid";
		public static final String EXTRA_SHOW_FRAGMENT_AS_SHORTCUT =
		":settings:show_fragment_as_shortcut";

		public static final String EXTRA_SHOW_FRAGMENT_AS_SUBSETTING =
		":settings:show_fragment_as_subsetting";

		@Deprecated
		public static final String EXTRA_HIDE_DRAWER = ":settings:hide_drawer";

		public static final String META_DATA_KEY_FRAGMENT_CLASS =
		"com.android.settings.FRAGMENT_CLASS";

src/com/android/settings/core/SubSettingLauncher.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -84,11 +84,6 @@ public class SubSettingLauncher {
		return this;
		}

		public SubSettingLauncher setIsShortCut(boolean isShortCut) {
		mLaunchRequest.isShortCut = isShortCut;
		return this;
		}

		public SubSettingLauncher setArguments(Bundle arguments) {
		mLaunchRequest.arguments = arguments;
		return this;
		@@ -159,8 +154,6 @@ public class SubSettingLauncher {
		intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID,
		mLaunchRequest.titleResId);
		intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, mLaunchRequest.title);
		intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SHORTCUT,
		mLaunchRequest.isShortCut);
		intent.addFlags(mLaunchRequest.flags);
		return intent;
		}
		@@ -195,7 +188,6 @@ public class SubSettingLauncher {
		int titleResId;
		String titleResPackageName;
		CharSequence title;
		boolean isShortCut;
		int sourceMetricsCategory = -100;
		int flags;
		Fragment mResultListener;

src/com/android/settings/password/ChooseLockGeneric.java

+1 −14

Original line number	Diff line number	Diff line
		@@ -19,8 +19,7 @@ package com.android.settings.password;
		import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD;
		import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;

		import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment
		.RESULT_FINISHED;
		import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment.RESULT_FINISHED;

		import android.accessibilityservice.AccessibilityServiceInfo;
		import android.app.Activity;
		@@ -77,12 +76,6 @@ public class ChooseLockGeneric extends SettingsActivity {
		public Intent getIntent() {
		Intent modIntent = new Intent(super.getIntent());
		modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getFragmentClass().getName());

		String action = modIntent.getAction();
		if (ACTION_SET_NEW_PASSWORD.equals(action)
		\|\| ACTION_SET_NEW_PARENT_PROFILE_PASSWORD.equals(action)) {
		modIntent.putExtra(EXTRA_HIDE_DRAWER, true);
		}
		return modIntent;
		}

		@@ -154,7 +147,6 @@ public class ChooseLockGeneric extends SettingsActivity {
		private FingerprintManager mFingerprintManager;
		private FaceManager mFaceManager;
		private int mUserId;
		private boolean mHideDrawer = false;
		private ManagedLockPasswordProvider mManagedPasswordProvider;
		private boolean mIsSetNewPassword = false;
		private UserManager mUserManager;
		@@ -194,7 +186,6 @@ public class ChooseLockGeneric extends SettingsActivity {
		mUserPassword = getActivity().getIntent().getStringExtra(
		ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
		}
		mHideDrawer = getActivity().getIntent().getBooleanExtra(EXTRA_HIDE_DRAWER, false);

		mHasChallenge = getActivity().getIntent().getBooleanExtra(
		ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
		@@ -345,7 +336,6 @@ public class ChooseLockGeneric extends SettingsActivity {
		mForFingerprint);
		intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE,
		mForFace);
		intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer);
		startActivityForResult(
		intent,
		mIsSetNewPassword && mHasChallenge
		@@ -748,9 +738,6 @@ public class ChooseLockGeneric extends SettingsActivity {
		} else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
		intent = getLockPatternIntent();
		}
		if (intent != null) {
		intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer);
		}
		return intent;
		}

src/com/android/settings/password/ChooseLockPassword.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -190,7 +190,6 @@ public class ChooseLockPassword extends SettingsActivity {
		private int mPasswordMinNonLetter = 0;
		private int mPasswordMinLengthToFulfillAllPolicies = 0;
		protected int mUserId;
		private boolean mHideDrawer = false;
		private byte[] mPasswordHistoryHashFactor;
		/**
		* Password requirements that we need to verify.
		@@ -375,7 +374,6 @@ public class ChooseLockPassword extends SettingsActivity {
		mForFace = intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
		processPasswordRequirements(intent);
		mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
		mHideDrawer = getActivity().getIntent().getBooleanExtra(EXTRA_HIDE_DRAWER, false);

		if (intent.getBooleanExtra(
		ChooseLockSettingsHelper.EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT, false)) {
		@@ -975,7 +973,6 @@ public class ChooseLockPassword extends SettingsActivity {
		if (!wasSecureBefore) {
		Intent intent = getRedactionInterstitialIntent(getActivity());
		if (intent != null) {
		intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer);
		startActivity(intent);
		}
		}

src/com/android/settings/password/ChooseLockPattern.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -196,7 +196,6 @@ public class ChooseLockPattern extends SettingsActivity {
		private TextView mFooterLeftButton;
		private TextView mFooterRightButton;
		protected List<LockPatternView.Cell> mChosenPattern = null;
		private boolean mHideDrawer = false;
		private ColorStateList mDefaultHeaderColorList;

		// ScrollView that contains title and header, only exist in land mode
		@@ -464,7 +463,6 @@ public class ChooseLockPattern extends SettingsActivity {
		w.start(mChooseLockSettingsHelper.utils(), required,
		false, 0, LockPatternUtils.stringToPattern(current), current, mUserId);
		}
		mHideDrawer = getActivity().getIntent().getBooleanExtra(EXTRA_HIDE_DRAWER, false);
		mForFingerprint = intent.getBooleanExtra(
		ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
		mForFace = intent.getBooleanExtra(
		@@ -808,7 +806,6 @@ public class ChooseLockPattern extends SettingsActivity {
		if (!wasSecureBefore) {
		Intent intent = getRedactionInterstitialIntent(getActivity());
		if (intent != null) {
		intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer);
		startActivity(intent);
		}
		}