commit c1f8600d9ffd399fbf6bc630ee35815a392727b9
author Pasty Chang <pastychang@google.com> Tue Dec 11 02:22:55 2018 +0000
committer Pasty Chang <pastychang@google.com> Wed Dec 12 03:16:29 2018 +0000
tree 2992a0fafd35a3d183534aa704393810d3227806
parent 0805dbb98c0c2dd1fe77828998f5f6a8ff2f5a69

Change to use setupcompat and setupdesign for suw pages

1. remove the dependence of setupwizardlib.
2. add to use setupcompat and setupdesign.
3. modify new footer button in following up cl.

Bug: 120805516
Bug: 120872944
Test: RunSettingsRoboTests
Change-Id: I463dd35b799d4250b2aabce0cb0b8102cf9dd7d6

src/com/android/settings/MasterClearConfirm.java

diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 8ebb710..ffbb2aa 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -43,8 +43,9 @@
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
 import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.setupwizardlib.TemplateLayout;
-import com.android.setupwizardlib.template.ButtonFooterMixin;
+
+import com.google.android.setupcompat.TemplateLayout;
+import com.google.android.setupdesign.template.ButtonFooterMixin;
 
 /**
  * Confirm and execute a reset of the device to a clean "just out of the box"