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

Commit 64b25588 authored by Daniel Nishi's avatar Daniel Nishi Committed by Android (Google) Code Review
Browse files

Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev

parents c2a929f0 5af567ec

res/layout/preference_list_fragment.xml

+5 −2
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
        android:visibility="gone">



        <Button android:id="@+id/back_button"

            style="?android:attr/buttonBarButtonStyle"

            android:layout_width="150dip"

            android:layout_height="wrap_content"

            android:layout_margin="5dip"
@@ -97,7 +98,8 @@ 
            android:layout_alignParentEnd="true">



            <Button android:id="@+id/skip_button"

                android:layout_width="150dip"

                style="?android:attr/buttonBarButtonStyle"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_margin="5dip"

                android:text="@*android:string/skip_button_label"
@@ -105,7 +107,8 @@ 
                />



            <Button android:id="@+id/next_button"

                android:layout_width="150dip"

                style="?android:attr/buttonBarButtonStyle"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_margin="5dip"

                android:text="@*android:string/next_button_label"

src/com/android/settings/deletionhelper/DeletionHelperFragment.java

+7 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ import android.text.format.Formatter; 
import android.util.ArraySet;

import android.util.Log;

import android.view.View;

import android.view.ViewGroup;

import android.widget.Button;

import android.widget.LinearLayout;

import com.android.settings.deletionhelper.DownloadsDeletionPreference;

import com.android.settings.CollapsibleCheckboxPreferenceGroup;

import com.android.settings.PhotosDeletionPreference;
@@ -113,13 +115,17 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement 
    }



    private void initializeButtons(View v) {

        mCancel = (Button) v.findViewById(R.id.back_button);

        mCancel = (Button) v.findViewById(R.id.skip_button);

        mCancel.setText(R.string.cancel);

        mCancel.setOnClickListener(this);

        mCancel.setVisibility(View.VISIBLE);



        mFree = (Button) v.findViewById(R.id.next_button);

        mFree.setText(R.string.storage_menu_free);

        mFree.setOnClickListener(this);



        Button back = (Button) v.findViewById(R.id.back_button);

        back.setVisibility(View.GONE);

    }



    private void initializeDeletionPreferences() {