PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle renamed APIs" into klp-dev

Browse Source
This commit is contained in:
Amith Yamasani
2013-09-05 22:49:20 +00:00
committed by Android (Google) Code Review
parent 8aea7b4d3d 14912666d9
commit 256637ffb3
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/MasterClear.java
View File

@@ -80,9 +80,9 @@ public class MasterClear extends Fragment {
} }
private boolean runRestrictionsChallenge() { private boolean runRestrictionsChallenge() {
if (UserManager.get(getActivity()).hasRestrictionsPin()) { if (UserManager.get(getActivity()).hasRestrictionsChallenge()) {
startActivityForResult( startActivityForResult(
new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE), PIN_REQUEST); new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE), PIN_REQUEST);
return true; return true;
} }
return false; return false;

8
src/com/android/settings/RestrictedSettingsFragment.java
View File

@@ -173,7 +173,7 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
if (!mChallengeSucceeded) { if (!mChallengeSucceeded) {
final UserManager um = UserManager.get(getActivity()); final UserManager um = UserManager.get(getActivity());
if (!mChallengeRequested) { if (!mChallengeRequested) {
if (um.hasRestrictionsPin()) { if (um.hasRestrictionsChallenge()) {
mResumeActionBundle = new Bundle(); mResumeActionBundle = new Bundle();
if (preference != null) { if (preference != null) {
mResumeActionBundle.putString(EXTRA_PREFERENCE, preference.getKey()); mResumeActionBundle.putString(EXTRA_PREFERENCE, preference.getKey());
@@ -182,7 +182,7 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
((CheckBoxPreference)preference).isChecked()); ((CheckBoxPreference)preference).isChecked());
} }
} }
Intent requestPin = new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE); Intent requestPin = new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE);
startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE); startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
mChallengeRequested = true; mChallengeRequested = true;
} }
@@ -200,7 +200,7 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
return false; return false;
} }
return mUserManager.hasUserRestriction(mRestrictionKey) return mUserManager.hasUserRestriction(mRestrictionKey)
&& !mUserManager.hasRestrictionsPin(); && !mUserManager.hasRestrictionsChallenge();
} }
/** /**
@@ -230,7 +230,7 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
} }
boolean restricted = RESTRICTIONS_PIN_SET.equals(restrictionKey) boolean restricted = RESTRICTIONS_PIN_SET.equals(restrictionKey)
|| mUserManager.hasUserRestriction(restrictionKey); || mUserManager.hasUserRestriction(restrictionKey);
return restricted && mUserManager.hasRestrictionsPin(); return restricted && mUserManager.hasRestrictionsChallenge();
} }
/** /**

6
src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -380,7 +380,7 @@ public class TrustedCredentialsSettings extends Fragment {
removeButton.setText(certHolder.mTab.getButtonLabel(certHolder)); removeButton.setText(certHolder.mTab.getButtonLabel(certHolder));
removeButton.setOnClickListener(new View.OnClickListener() { removeButton.setOnClickListener(new View.OnClickListener() {
@Override public void onClick(View v) { @Override public void onClick(View v) {
if (mUserManager.hasRestrictionsPin() && !mChallengeSucceeded) { if (mUserManager.hasRestrictionsChallenge() && !mChallengeSucceeded) {
ensurePin(); ensurePin();
return; return;
} }
@@ -426,9 +426,9 @@ public class TrustedCredentialsSettings extends Fragment {
if (!mChallengeSucceeded) { if (!mChallengeSucceeded) {
final UserManager um = UserManager.get(getActivity()); final UserManager um = UserManager.get(getActivity());
if (!mChallengeRequested) { if (!mChallengeRequested) {
if (um.hasRestrictionsPin()) { if (um.hasRestrictionsChallenge()) {
Intent requestPin = Intent requestPin =
new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE); new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE);
startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE); startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
mChallengeRequested = true; mChallengeRequested = true;
} }