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

Merge "Change to use footer button of setupcompat"

Browse Source
This commit is contained in:
Pasty Chang
2018-12-18 07:01:55 +00:00
committed by Android (Google) Code Review
parent 0c4214a200 103409bd4a
commit f41bbae1c4
7 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/MasterClear.java
View File

@@ -66,7 +66,9 @@ import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupdesign.template.ButtonFooterMixin;
import com.google.android.setupcompat.item.FooterButton;
import com.google.android.setupcompat.item.FooterButton.ButtonType;
import com.google.android.setupcompat.template.ButtonFooterMixin;
import java.util.List;
@@ -96,7 +98,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
private View mContentView;
@VisibleForTesting
Button mInitiateButton;
FooterButton mInitiateButton;
private View mExternalStorageContainer;
@VisibleForTesting
CheckBox mExternalStorage;
@@ -416,12 +418,15 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
buttonFooterMixin.removeAllViews();
buttonFooterMixin.addSpace();
buttonFooterMixin.addSpace();
mInitiateButton = buttonFooterMixin.addButton(R.string.master_clear_button_text,
R.style.SuwGlifButton_Primary);
mInitiateButton.setOnClickListener(mInitiateListener);
buttonFooterMixin.setPrimaryButton(
new FooterButton(
getActivity(),
R.string.master_clear_button_text,
mInitiateListener,
ButtonType.OTHER,
R.style.SuwGlifButton_Primary)
);
mInitiateButton = buttonFooterMixin.getPrimaryButton();
}
private void getContentDescription(View v, StringBuffer description) {

17
src/com/android/settings/MasterClearConfirm.java
View File

@@ -45,7 +45,9 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupdesign.template.ButtonFooterMixin;
import com.google.android.setupcompat.item.FooterButton;
import com.google.android.setupcompat.item.FooterButton.ButtonType;
import com.google.android.setupcompat.template.ButtonFooterMixin;
/**
* Confirm and execute a reset of the device to a clean "just out of the box"
@@ -153,11 +155,14 @@ public class MasterClearConfirm extends InstrumentedFragment {
final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
buttonFooterMixin.removeAllViews();
buttonFooterMixin.addSpace();
buttonFooterMixin.addSpace();
buttonFooterMixin.addButton(R.string.master_clear_button_text,
R.style.SuwGlifButton_Primary).setOnClickListener(mFinalClickListener);
buttonFooterMixin.setPrimaryButton(
new FooterButton(
getActivity(),
R.string.master_clear_button_text,
mFinalClickListener,
ButtonType.OTHER,
R.style.SuwGlifButton_Primary)
);
}
private void setUpActionBarAndTitle() {