From 94f759230aded83276b538a766c18ea5063c7340 Mon Sep 17 00:00:00 2001 From: Hao Dong Date: Wed, 16 Aug 2023 19:43:41 +0000 Subject: [PATCH] Fix face delete button rotation not working. Bug: 264503740 Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="FaceSettingsRemoveButtonPreferenceControllerTest" Change-Id: I28a281ca1ed16940400c44272f9fa78f5eb190af --- ...tingsRemoveButtonPreferenceController.java | 47 +++++--- ...sRemoveButtonPreferenceControllerTest.java | 103 ++++++++++++++++++ 2 files changed, 136 insertions(+), 14 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceControllerTest.java diff --git a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java index 1e74ad7c822..4b2e3363b6d 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java @@ -30,6 +30,7 @@ import android.view.View; import android.widget.Button; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import com.android.settings.R; @@ -57,10 +58,18 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference static final String KEY = "security_settings_face_delete_faces_container"; public static class ConfirmRemoveDialog extends InstrumentedDialogFragment { - - private boolean mIsConvenience; + private static final String KEY_IS_CONVENIENCE = "is_convenience"; private DialogInterface.OnClickListener mOnClickListener; + /** Returns the new instance of the class */ + public static ConfirmRemoveDialog newInstance(boolean isConvenience) { + final ConfirmRemoveDialog dialog = new ConfirmRemoveDialog(); + final Bundle args = new Bundle(); + args.putBoolean(KEY_IS_CONVENIENCE, isConvenience); + dialog.setArguments(args); + return dialog; + } + @Override public int getMetricsCategory() { return SettingsEnums.DIALOG_FACE_REMOVE; @@ -68,6 +77,8 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference @Override public Dialog onCreateDialog(Bundle savedInstanceState) { + boolean isConvenience = getArguments().getBoolean(KEY_IS_CONVENIENCE); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); final PackageManager pm = getContext().getPackageManager(); @@ -75,11 +86,11 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference final int dialogMessageRes; if (hasFingerprint) { - dialogMessageRes = mIsConvenience + dialogMessageRes = isConvenience ? R.string.security_settings_face_remove_dialog_details_fingerprint_conv : R.string.security_settings_face_remove_dialog_details_fingerprint; } else { - dialogMessageRes = mIsConvenience + dialogMessageRes = isConvenience ? R.string.security_settings_face_settings_remove_dialog_details_convenience : R.string.security_settings_face_settings_remove_dialog_details; } @@ -93,10 +104,6 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference return dialog; } - public void setIsConvenience(boolean isConvenience) { - mIsConvenience = isConvenience; - } - public void setOnClickListener(DialogInterface.OnClickListener listener) { mOnClickListener = listener; } @@ -111,7 +118,8 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference private Listener mListener; private SettingsActivity mActivity; private int mUserId; - private boolean mRemoving; + @VisibleForTesting + boolean mRemoving; private final MetricsFeatureProvider mMetricsFeatureProvider; private final Context mContext; @@ -142,7 +150,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference } }; - private final DialogInterface.OnClickListener mOnClickListener + private final DialogInterface.OnClickListener mOnConfirmDialogClickListener = new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -196,6 +204,16 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference mButton.setOnClickListener(this); + // If there is already a ConfirmRemoveDialog showing, reset the listener since the + // controller has been recreated. + ConfirmRemoveDialog removeDialog = + (ConfirmRemoveDialog) mActivity.getSupportFragmentManager() + .findFragmentByTag(ConfirmRemoveDialog.class.getName()); + if (removeDialog != null) { + mRemoving = true; + removeDialog.setOnClickListener(mOnConfirmDialogClickListener); + } + if (!FaceSettings.isFaceHardwareDetected(mContext)) { mButton.setEnabled(false); } else { @@ -218,10 +236,11 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference if (v == mButton) { mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory()); mRemoving = true; - ConfirmRemoveDialog dialog = new ConfirmRemoveDialog(); - dialog.setOnClickListener(mOnClickListener); - dialog.setIsConvenience(BiometricUtils.isConvenience(mFaceManager)); - dialog.show(mActivity.getSupportFragmentManager(), ConfirmRemoveDialog.class.getName()); + ConfirmRemoveDialog confirmRemoveDialog = + ConfirmRemoveDialog.newInstance(BiometricUtils.isConvenience(mFaceManager)); + confirmRemoveDialog.setOnClickListener(mOnConfirmDialogClickListener); + confirmRemoveDialog.show(mActivity.getSupportFragmentManager(), + ConfirmRemoveDialog.class.getName()); } } diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceControllerTest.java new file mode 100644 index 00000000000..5f56fa746ba --- /dev/null +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceControllerTest.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.biometrics.face; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.content.pm.PackageManager; +import android.hardware.face.FaceManager; + +import com.android.settings.R; +import com.android.settings.SettingsActivity; +import com.android.settings.biometrics.face.FaceSettingsRemoveButtonPreferenceController.ConfirmRemoveDialog; +import com.android.settings.testutils.shadow.ShadowUserManager; +import com.android.settingslib.widget.LayoutPreference; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowApplication; + +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class}) +public class FaceSettingsRemoveButtonPreferenceControllerTest { + @Rule + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + private static final String TEST_PREF_KEY = "baz"; + + @Mock + private FaceManager mFaceManager; + @Mock + private PackageManager mPackageManager; + private SettingsActivity mActivity; + private Context mContext; + private FaceSettingsRemoveButtonPreferenceController mController; + private LayoutPreference mPreference; + + @Before + public void setUp() { + mContext = spy(RuntimeEnvironment.application); + when(mContext.getPackageManager()).thenReturn(mPackageManager); + when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true); + ShadowApplication.getInstance().setSystemService(Context.FACE_SERVICE, mFaceManager); + + mPreference = new LayoutPreference(mContext, R.layout.face_remove_button); + mController = new FaceSettingsRemoveButtonPreferenceController(mContext, TEST_PREF_KEY); + + mActivity = spy(Robolectric.buildActivity(SettingsActivity.class).create().get()); + mController.setActivity(mActivity); + } + + @Test + public void testRotationConfirmRemoveDialog() { + // mController calls onClick(), the dialog is created. + mController.updateState(mPreference); + assertThat(mController.mRemoving).isFalse(); + + mController.onClick( + mPreference.findViewById(R.id.security_settings_face_settings_remove_button)); + + ConfirmRemoveDialog removeDialog = + (ConfirmRemoveDialog) mActivity.getSupportFragmentManager() + .findFragmentByTag(ConfirmRemoveDialog.class.getName()); + assertThat(removeDialog).isNotNull(); + assertThat(mController.mRemoving).isTrue(); + + + // Simulate rotation, a new controller mController2 is created and updateState() is called. + // Since the dialog hasn't been dismissed, so mController2.mRemoving should be true + FaceSettingsRemoveButtonPreferenceController controller2 = + new FaceSettingsRemoveButtonPreferenceController(mContext, TEST_PREF_KEY); + controller2.setActivity(mActivity); + assertThat(controller2.mRemoving).isFalse(); + controller2.updateState(mPreference); + assertThat(controller2.mRemoving).isTrue(); + } +}