commit 9bdb59a7640ea1e4e4d0ff2f6275a0db94aa36dc
author pastychang <pastychang@google.com> Mon Jan 21 09:49:15 2019 +0800
committer pastychang <pastychang@google.com> Thu Jan 24 16:18:28 2019 +0800
tree 210bd40121662b08e738d4cbc2d8c98bd9853bf9
parent 875178bbfa1419dae65db699f73bfd2e8fdb6585

Rename ButtonFooterMixin to FooterBarMixin

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

Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Ic6937e3cbc515dd7bf877c9193932cd5800ac801

src/com/android/settings/MasterClear.java

diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index f9e4317..8dad57f 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -66,9 +66,9 @@
 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 @@
         }
 
         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 @@
                         .setTheme(R.style.SudGlifButton_Primary)
                         .build()
         );
-        mInitiateButton = buttonFooterMixin.getPrimaryButton();
+        mInitiateButton = mixin.getPrimaryButton();
     }
 
     private void getContentDescription(View v, StringBuffer description) {