Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c7f4de9 authored by tmfang's avatar tmfang
Browse files

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
parent 3adb74ea

src/com/android/settings/applications/AppStorageSettings.java

+1 −4
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java

+3 −8
Original line number Diff line number Diff line
@@ -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;

        }

src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java

+2 −5
Original line number Diff line number Diff line
@@ -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;

            }

        }

src/com/android/settings/tts/TextToSpeechSettings.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/widget/ActionButtonPreference.java

+0 −10
Original line number Diff line number Diff line
@@ -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;