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

Merge changes I74d677dc,I17f4db85 into qt-dev

Browse Source 
* changes:
  Only gray out remove button after positive button is pressed
  Check PackageManager before getting system service
This commit is contained in:
Kevin Chyn
2019-04-25 22:48:02 +00:00
committed by Android (Google) Code Review
parent 30991963e4 f19fb6fa46
commit 8888d346d1
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java
View File

@@ -22,6 +22,8 @@ import android.content.Context;
import android.hardware.face.FaceManager; import android.hardware.face.FaceManager;
import android.provider.Settings; import android.provider.Settings;
import com.android.settings.Utils;
import androidx.preference.Preference; import androidx.preference.Preference;
/** /**
@@ -40,7 +42,7 @@ public class FaceSettingsAppPreferenceController extends FaceSettingsPreferenceC
public FaceSettingsAppPreferenceController(Context context, String preferenceKey) { public FaceSettingsAppPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mFaceManager = context.getSystemService(FaceManager.class); mFaceManager = Utils.getFaceManagerOrNull(context);
} }
public FaceSettingsAppPreferenceController(Context context) { public FaceSettingsAppPreferenceController(Context context) {

3
src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
/** /**
@@ -46,7 +47,7 @@ public class FaceSettingsConfirmPreferenceController extends FaceSettingsPrefere
public FaceSettingsConfirmPreferenceController(Context context, public FaceSettingsConfirmPreferenceController(Context context,
String preferenceKey) { String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mFaceManager = context.getSystemService(FaceManager.class); mFaceManager = Utils.getFaceManagerOrNull(context);
} }
@Override @Override

3
src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
View File

@@ -26,6 +26,7 @@ import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
/** /**
@@ -44,7 +45,7 @@ public class FaceSettingsKeyguardPreferenceController extends FaceSettingsPrefer
public FaceSettingsKeyguardPreferenceController(Context context, String preferenceKey) { public FaceSettingsKeyguardPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mFaceManager = context.getSystemService(FaceManager.class); mFaceManager = Utils.getFaceManagerOrNull(context);
} }
public FaceSettingsKeyguardPreferenceController(Context context) { public FaceSettingsKeyguardPreferenceController(Context context) {

2
src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
View File

@@ -117,6 +117,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) { if (which == DialogInterface.BUTTON_POSITIVE) {
mButton.setEnabled(false);
final List<Face> faces = mFaceManager.getEnrolledFaces(mUserId); final List<Face> faces = mFaceManager.getEnrolledFaces(mUserId);
if (faces.isEmpty()) { if (faces.isEmpty()) {
Log.e(TAG, "No faces"); Log.e(TAG, "No faces");
@@ -177,7 +178,6 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
public void onClick(View v) { public void onClick(View v) {
if (v == mButton) { if (v == mButton) {
mRemoving = true; mRemoving = true;
mButton.setEnabled(false);
ConfirmRemoveDialog dialog = new ConfirmRemoveDialog(); ConfirmRemoveDialog dialog = new ConfirmRemoveDialog();
dialog.setOnClickListener(mOnClickListener); dialog.setOnClickListener(mOnClickListener);
dialog.show(mActivity.getSupportFragmentManager(), ConfirmRemoveDialog.class.getName()); dialog.show(mActivity.getSupportFragmentManager(), ConfirmRemoveDialog.class.getName());