commit 0111db7181471cbf0e2f724026dba11f92dbe5cd
author Maurice Lam <yukl@google.com> Thu Feb 14 22:01:10 2019 +0000
committer Maurice Lam <yukl@google.com> Thu Feb 14 22:01:10 2019 +0000
tree c34d38d5978f88c2e8cb92fc72e96d86ee270d15
parent 39b02386f7ca93792d4261103b5b90c777d7dc8e

Revert "Remove TemplateLayout that is not for external use"

This reverts commit 39b02386f7ca93792d4261103b5b90c777d7dc8e.

Reason for revert: b/124450605

Change-Id: I3b2d66c87dc645da0d4e8ded798a1b80381523cf

src/com/android/settings/MasterClear.java

diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 58bc58c..8dad57f 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -65,10 +65,10 @@
 import com.android.settings.password.ConfirmLockPattern;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
+import com.google.android.setupcompat.TemplateLayout;
 import com.google.android.setupcompat.template.FooterBarMixin;
 import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupcompat.template.FooterButton.ButtonType;
-import com.google.android.setupdesign.GlifLayout;
 
 import java.util.List;
 
@@ -416,7 +416,7 @@
             return;
         }
 
-        final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
+        final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
         final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
         mixin.setPrimaryButton(
                 new FooterButton.Builder(getActivity())

src/com/android/settings/MasterClearConfirm.java

diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 618dd2c..c25f2af 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -44,10 +44,10 @@
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
+import com.google.android.setupcompat.TemplateLayout;
 import com.google.android.setupcompat.template.FooterBarMixin;
 import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupcompat.template.FooterButton.ButtonType;
-import com.google.android.setupdesign.GlifLayout;
 
 /**
  * Confirm and execute a reset of the device to a clean "just out of the box"
@@ -152,7 +152,7 @@
      * Configure the UI for the final confirmation interaction
      */
     private void establishFinalConfirmationState() {
-        final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
+        final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
 
         final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
         mixin.setPrimaryButton(