commit 3b15d6234dc9097869030c1e5e2b26a9b34d1f19
author Maurice Lam <yukl@google.com> Tue May 24 00:45:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 24 00:45:15 2016 +0000
tree a1de651c6651a587dfc69bf27eba0a3704d26230
parent 64b25588b7aa1f377ffb1585c1a9f07c1705b7f0
parent b357e4a81ace85a15a167b2b081567dd434cbf89

Merge "Update margins to match specs" into nyc-mr1-dev

res/layout/preference_list_fragment.xml

diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index 9f1e076..6e540c4 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -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

diff --git a/src/com/android/settings/deletionhelper/DeletionHelperFragment.java b/src/com/android/settings/deletionhelper/DeletionHelperFragment.java
index e6b99df..68144f8 100644
--- a/src/com/android/settings/deletionhelper/DeletionHelperFragment.java
+++ b/src/com/android/settings/deletionhelper/DeletionHelperFragment.java
@@ -25,7 +25,9 @@
 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 @@
     }
 
     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() {