Merge "Remove flag com.android.settings.flags.show_factory_reset_cancel_button" into main (4b0a62b2) · Commits · e / os / android_packages_apps_Settings

aconfig/settings_flag_declarations.aconfig

+0 −7

Original line number	Diff line number	Diff line
		package: "com.android.settings.flags"
		container: "system_ext"

		flag {
		name: "show_factory_reset_cancel_button"
		namespace: "android_settings"
		description: "This flag controls whether to show a Cancel button when factory reset"
		bug: "300634367"
		}

		flag {
		name: "mainline_module_explicit_intent"
		namespace: "android_settings"

src/com/android/settings/MainClear.java

+6 −9

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ import androidx.annotation.VisibleForTesting;
		import com.android.settings.biometrics.IdentityCheckBiometricErrorDialog;
		import com.android.settings.core.InstrumentedFragment;
		import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
		import com.android.settings.flags.Flags;
		import com.android.settings.password.ChooseLockSettingsHelper;
		import com.android.settings.password.ConfirmDeviceCredentialActivity;
		import com.android.settings.password.ConfirmLockPattern;
		@@ -484,14 +483,12 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
		.setListener(mInitiateListener)
		.setButtonType(ButtonType.OTHER)
		.build());
		if (Flags.showFactoryResetCancelButton()) {
		mixin.setSecondaryButton(
		new FooterButton.Builder(activity)
		.setText(android.R.string.cancel)
		.setListener(view -> activity.onBackPressed())
		.setButtonType(ButtonType.CANCEL)
		.build());
		}
		mInitiateButton = mixin.getPrimaryButton();
		}

tests/unit/src/com/android/settings/MainClearTest.kt

+1 −19

Original line number	Diff line number	Diff line
		@@ -16,20 +16,16 @@

		package com.android.settings

		import android.platform.test.flag.junit.SetFlagsRule
		import androidx.test.core.app.ActivityScenario
		import androidx.test.espresso.Espresso.onView
		import androidx.test.espresso.action.ViewActions.click
		import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
		import androidx.test.espresso.assertion.ViewAssertions.matches
		import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
		import androidx.test.espresso.matcher.ViewMatchers.withText
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.settings.Settings.FactoryResetActivity
		import com.android.settings.flags.Flags
		import com.google.common.truth.Truth.assertThat
		import org.junit.Ignore
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith

		@@ -37,22 +33,8 @@ import org.junit.runner.RunWith
		@Ignore
		@RunWith(AndroidJUnit4::class)
		class MainClearTest {
		@get:Rule
		val mSetFlagsRule = SetFlagsRule()

		@Test
		fun factoryResetCancelButton_flagDisabled_noCancelButton() {
		mSetFlagsRule.disableFlags(Flags.FLAG_SHOW_FACTORY_RESET_CANCEL_BUTTON)
		ActivityScenario.launch(FactoryResetActivity::class.java).use {
		ensurePrimaryButton()
		onView(withText(android.R.string.cancel)).check(doesNotExist())
		it.onActivity { activity -> assertThat(activity.isFinishing).isFalse() }
		}
		}

		@Test
		fun factoryResetCancelButton_flagEnabled_showCancelButton() {
		mSetFlagsRule.enableFlags(Flags.FLAG_SHOW_FACTORY_RESET_CANCEL_BUTTON)
		fun factoryResetCancelButton() {
		ActivityScenario.launch(FactoryResetActivity::class.java).use {
		ensurePrimaryButton()
		it.onActivity { activity -> assertThat(activity.isFinishing).isFalse() }