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

Clean up multi window toast on FingerprintEnrollEnrolling.

Browse Source 
ag/22361082 and ag/22460413 have added a dialog preventing entering
FingerprintEnrollEnrolling. So showing toast and early return in
onCreate() will never be reached. This CL cleans up this obsolete code
block.

Bug: 283244022
Test: N/A

Change-Id: Ifc5f3d909a275c735035146e44f70d2b5d5b51e3
This commit is contained in:
Hao Dong
2023-06-07 18:14:13 +00:00
parent 83e44f83ae
commit 3d81e3893e
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -59,7 +59,6 @@ import android.view.animation.Interpolator;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.IdRes; import androidx.annotation.IdRes;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
@@ -217,14 +216,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (isInMultiWindowMode()) {
final Toast splitUnsupportedToast = Toast.makeText(this,
R.string.dock_multi_instances_not_supported_text, Toast.LENGTH_SHORT);
splitUnsupportedToast.show();
finish();
return;
}
if (savedInstanceState != null) { if (savedInstanceState != null) {
restoreSavedState(savedInstanceState); restoreSavedState(savedInstanceState);
} }

11
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
View File

@@ -78,7 +78,6 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.android.controller.ActivityController; import org.robolectric.android.controller.ActivityController;
import org.robolectric.shadows.ShadowToast;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList; import java.util.ArrayList;
@@ -119,16 +118,6 @@ public class FingerprintEnrollEnrollingTest {
FakeFeatureFactory.setupForTest(); FakeFeatureFactory.setupForTest();
} }
@Test
public void fingerprintMultiWindowMode() {
initializeActivityWithoutCreate(TYPE_UDFPS_OPTICAL);
when(mActivity.isInMultiWindowMode()).thenReturn(true);
createActivity();
assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
mContext.getString(R.string.dock_multi_instances_not_supported_text));
}
@Test @Test
public void fingerprintUdfpsEnrollSuccessProgress_shouldNotVibrate() { public void fingerprintUdfpsEnrollSuccessProgress_shouldNotVibrate() {
initializeActivityFor(TYPE_UDFPS_OPTICAL); initializeActivityFor(TYPE_UDFPS_OPTICAL);