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

Rename ButtonFooterMixin to FooterBarMixin

Browse Source 
1. Change to FooterBarMixin
2. Move FooterButton to the same package with FooterBarMixin

Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Ic6937e3cbc515dd7bf877c9193932cd5800ac801
This commit is contained in:
pastychang
2019-01-21 09:49:15 +08:00
parent 875178bbfa
commit 9bdb59a764
30 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,9 +66,9 @@ import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupcompat.item.FooterButton;
import com.google.android.setupcompat.item.FooterButton.ButtonType;
import com.google.android.setupcompat.template.ButtonFooterMixin;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.template.FooterButton.ButtonType;
import java.util.List;
@@ -417,8 +417,8 @@ 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.setPrimaryButton(
final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getActivity())
.setText(R.string.master_clear_button_text)
.setListener(mInitiateListener)
@@ -426,7 +426,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
.setTheme(R.style.SudGlifButton_Primary)
.build()
);
mInitiateButton = buttonFooterMixin.getPrimaryButton();
mInitiateButton = mixin.getPrimaryButton();
}
private void getContentDescription(View v, StringBuffer description) {