From 5c7f4de999ad5c0fb59892aed20fc537ba8c18a5 Mon Sep 17 00:00:00 2001 From: tmfang Date: Wed, 14 Nov 2018 18:18:44 +0800 Subject: [PATCH] Remove setButtonPositive method Since new UI design only exist two button in layout, we don't need these methods anymore. Test: robotest Bug: 116346008 Change-Id: If2e8f7dddb9c13e480438f36fe3c5d6affa4e9ff --- .../settings/applications/AppStorageSettings.java | 5 +---- .../appinfo/AppButtonsPreferenceController.java | 11 +++-------- .../bluetooth/BluetoothDetailsButtonsController.java | 7 ++----- .../android/settings/tts/TextToSpeechSettings.java | 2 -- .../settings/widget/ActionButtonPreference.java | 10 ---------- .../wifi/details/WifiDetailPreferenceController.java | 2 -- .../settings/widget/ActionButtonPreferenceTest.java | 2 -- 7 files changed, 6 insertions(+), 33 deletions(-) diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index 467b42e139e..841fb5150f8 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -167,10 +167,7 @@ public class AppStorageSettings extends AppInfoWithHeader .setComputingString(R.string.computing_size) .setErrorString(R.string.invalid_size_value) .build(); - mButtonsPref = ((ActionButtonPreference) findPreference(KEY_HEADER_BUTTONS)) - .setButton1Positive(false) - .setButton2Positive(false); - + mButtonsPref = ((ActionButtonPreference) findPreference(KEY_HEADER_BUTTONS)); mStorageUsed = findPreference(KEY_STORAGE_USED); mChangeStorageButton = (Button) ((LayoutPreference) findPreference(KEY_CHANGE_STORAGE)) .findViewById(R.id.button); diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java index b7023bb01ea..8d19112dfde 100644 --- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java @@ -170,8 +170,6 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp .setButton2Icon(R.drawable.ic_settings_force_stop) .setButton1OnClickListener(new UninstallAndDisableButtonListener()) .setButton2OnClickListener(new ForceStopButtonListener()) - .setButton1Positive(false) - .setButton2Positive(false) .setButton2Enabled(false); } } @@ -544,18 +542,15 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp || isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) { // Disable button for core system applications. mButtonsPref.setButton1Text(R.string.uninstall_text) - .setButton1Icon(R.drawable.ic_settings_delete) - .setButton1Positive(false); + .setButton1Icon(R.drawable.ic_settings_delete); } else if (mAppEntry.info.enabled && !isDisabledUntilUsed()) { mButtonsPref.setButton1Text(R.string.uninstall_text) - .setButton1Icon(R.drawable.ic_settings_delete) - .setButton1Positive(false); + .setButton1Icon(R.drawable.ic_settings_delete); disableable = !mApplicationFeatureProvider.getKeepEnabledPackages() .contains(mAppEntry.info.packageName); } else { mButtonsPref.setButton1Text(R.string.install_text) - .setButton1Icon(R.drawable.ic_settings_install) - .setButton1Positive(true); + .setButton1Icon(R.drawable.ic_settings_install); disableable = true; } diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java index ac90870cf8f..563a06a01f3 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java @@ -55,7 +55,6 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle .setButton1Text(R.string.forget) .setButton1Icon(R.drawable.ic_settings_delete) .setButton1OnClickListener((view) -> onForgetButtonPressed()) - .setButton1Positive(false) .setButton1Enabled(true); } @@ -70,8 +69,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle mActionButtons .setButton2Text(R.string.bluetooth_device_context_disconnect) .setButton2Icon(R.drawable.ic_settings_close) - .setButton2OnClickListener(view -> mCachedDevice.disconnect()) - .setButton2Positive(false); + .setButton2OnClickListener(view -> mCachedDevice.disconnect()); mConnectButtonInitialized = true; } } else { @@ -80,8 +78,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle .setButton2Text(R.string.bluetooth_device_context_connect) // TODO (b/119646923) Icon is not ready. .setButton2OnClickListener( - view -> mCachedDevice.connect(true /* connectAllProfiles */)) - .setButton2Positive(true); + view -> mCachedDevice.connect(true /* connectAllProfiles */)); mConnectButtonInitialized = true; } } diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index cce871b4f33..b1a1f8fcf6a 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -171,11 +171,9 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment mActionButtons = ((ActionButtonPreference) findPreference(KEY_ACTION_BUTTONS)) .setButton1Text(R.string.tts_play) - .setButton1Positive(true) .setButton1OnClickListener(v -> speakSampleText()) .setButton1Enabled(false) .setButton2Text(R.string.tts_reset) - .setButton2Positive(false) .setButton2OnClickListener(v -> resetTts()) .setButton1Enabled(true); diff --git a/src/com/android/settings/widget/ActionButtonPreference.java b/src/com/android/settings/widget/ActionButtonPreference.java index 9fe80c0c1d7..7ce84bd0529 100644 --- a/src/com/android/settings/widget/ActionButtonPreference.java +++ b/src/com/android/settings/widget/ActionButtonPreference.java @@ -159,16 +159,6 @@ public class ActionButtonPreference extends Preference { return this; } - @Deprecated - public ActionButtonPreference setButton1Positive(boolean isPositive) { - return this; - } - - @Deprecated - public ActionButtonPreference setButton2Positive(boolean isPositive) { - return this; - } - public ActionButtonPreference setButton1Visible(boolean isVisible) { if (isVisible != mButton1Info.mIsVisible) { mButton1Info.mIsVisible = isVisible; diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index ea31b1b24c7..3bf38a773ae 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -279,10 +279,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController mButtonsPref = ((ActionButtonPreference) screen.findPreference(KEY_BUTTONS_PREF)) .setButton1Text(R.string.forget) .setButton1Icon(R.drawable.ic_settings_delete) - .setButton1Positive(false) .setButton1OnClickListener(view -> forgetNetwork()) .setButton2Text(R.string.wifi_sign_in_button_text) - .setButton2Positive(true) .setButton2OnClickListener(view -> signIntoNetwork()); mSignalStrengthPref = diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java index fb952a7c2eb..2a15127d0ba 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java @@ -133,14 +133,12 @@ public class ActionButtonPreferenceTest { final ActionButtonPreference pref = mock(ActionButtonPreference.class); when(pref.setButton1Text(anyInt())).thenReturn(pref); when(pref.setButton1Icon(anyInt())).thenReturn(pref); - when(pref.setButton1Positive(anyBoolean())).thenReturn(pref); when(pref.setButton1Enabled(anyBoolean())).thenReturn(pref); when(pref.setButton1Visible(anyBoolean())).thenReturn(pref); when(pref.setButton1OnClickListener(any(View.OnClickListener.class))).thenReturn(pref); when(pref.setButton2Text(anyInt())).thenReturn(pref); when(pref.setButton2Icon(anyInt())).thenReturn(pref); - when(pref.setButton2Positive(anyBoolean())).thenReturn(pref); when(pref.setButton2Enabled(anyBoolean())).thenReturn(pref); when(pref.setButton2Visible(anyBoolean())).thenReturn(pref); when(pref.setButton2OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);