PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 64b25588b7

* commit '64b25588b7aa1f377ffb1585c1a9f07c1705b7f0':
  Materialize the button bar in the Deletion Helper.

Change-Id: Iece17635fc4c7a0ffd112381068b39a84bc3daeb
This commit is contained in:
Daniel Nishi
2016-05-23 20:28:56 +00:00
committed by android-build-merger
parent d39ac69ef1 64b25588b7
commit f16b8be7b4
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/preference_list_fragment.xml
View File

@@ -83,6 +83,7 @@
android:visibility="gone"> android:visibility="gone">
<Button android:id="@+id/back_button" <Button android:id="@+id/back_button"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="150dip" android:layout_width="150dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dip" android:layout_margin="5dip"
@@ -97,7 +98,8 @@
android:layout_alignParentEnd="true"> android:layout_alignParentEnd="true">
<Button android:id="@+id/skip_button" <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_height="wrap_content"
android:layout_margin="5dip" android:layout_margin="5dip"
android:text="@*android:string/skip_button_label" android:text="@*android:string/skip_button_label"
@@ -105,7 +107,8 @@
/> />
<Button android:id="@+id/next_button" <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_height="wrap_content"
android:layout_margin="5dip" android:layout_margin="5dip"
android:text="@*android:string/next_button_label" android:text="@*android:string/next_button_label"

8
src/com/android/settings/deletionhelper/DeletionHelperFragment.java
View File

@@ -25,7 +25,9 @@ import android.text.format.Formatter;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.LinearLayout;
import com.android.settings.deletionhelper.DownloadsDeletionPreference; import com.android.settings.deletionhelper.DownloadsDeletionPreference;
import com.android.settings.CollapsibleCheckboxPreferenceGroup; import com.android.settings.CollapsibleCheckboxPreferenceGroup;
import com.android.settings.PhotosDeletionPreference; import com.android.settings.PhotosDeletionPreference;
@@ -113,13 +115,17 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
} }
private void initializeButtons(View v) { 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.setText(R.string.cancel);
mCancel.setOnClickListener(this); mCancel.setOnClickListener(this);
mCancel.setVisibility(View.VISIBLE);
mFree = (Button) v.findViewById(R.id.next_button); mFree = (Button) v.findViewById(R.id.next_button);
mFree.setText(R.string.storage_menu_free); mFree.setText(R.string.storage_menu_free);
mFree.setOnClickListener(this); mFree.setOnClickListener(this);
Button back = (Button) v.findViewById(R.id.back_button);
back.setVisibility(View.GONE);
} }
private void initializeDeletionPreferences() { private void initializeDeletionPreferences() {