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

Merge "Fix restricted fragment dialogs" into pi-dev am: dbe38b09cf

Browse Source 
am: c1b16f62ad

Change-Id: I32ec3d32e067f03f63335292c7541253bfe372ff
This commit is contained in:
Salvador Martinez
2018-04-19 13:25:14 -07:00
committed by android-build-merger
parent de7d61b301 c1b16f62ad
commit 9d03322d2c
2 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import android.os.Bundle;
import android.os.PersistableBundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.widget.TextView;
@@ -56,7 +57,7 @@ public abstract class RestrictedSettingsFragment extends SettingsPreferenceFragm
protected static final String RESTRICT_IF_OVERRIDABLE = "restrict_if_overridable";
// No RestrictedSettingsFragment screens should use this number in startActivityForResult.
private static final int REQUEST_PIN_CHALLENGE = 12309;
@VisibleForTesting static final int REQUEST_PIN_CHALLENGE = 12309;
private static final String KEY_CHALLENGE_SUCCEEDED = "chsc";
private static final String KEY_CHALLENGE_REQUESTED = "chrq";
@@ -86,7 +87,8 @@ public abstract class RestrictedSettingsFragment extends SettingsPreferenceFragm
}
};
private AlertDialog mActionDisabledDialog;
@VisibleForTesting
AlertDialog mActionDisabledDialog;
/**
* @param restrictionKey The restriction key to check before pin protecting
@@ -153,6 +155,10 @@ public abstract class RestrictedSettingsFragment extends SettingsPreferenceFragm
if (resultCode == Activity.RESULT_OK) {
mChallengeSucceeded = true;
mChallengeRequested = false;
if (mActionDisabledDialog != null && mActionDisabledDialog.isShowing()) {
mActionDisabledDialog.setOnDismissListener(null);
mActionDisabledDialog.dismiss();
}
} else {
mChallengeSucceeded = false;
}