From 59f1c1ad70db38ad8ca6aff6b1148b3039d7bdfa Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Thu, 14 Feb 2019 22:04:30 +0000 Subject: [PATCH] Revert "Revert "Remove TemplateLayout that is not for external use"" This reverts commit 0111db7181471cbf0e2f724026dba11f92dbe5cd. Reason for revert: Roll forward Change-Id: I0a7642915dbf3b16115456ab9c264cf1acf93d01 --- src/com/android/settings/MasterClear.java | 4 ++-- src/com/android/settings/MasterClearConfirm.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index 8dad57fc65..58bc58c475 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -65,10 +65,10 @@ import com.android.settings.password.ChooseLockSettingsHelper; 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 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL return; } - final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout); + final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout); final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class); mixin.setPrimaryButton( new FooterButton.Builder(getActivity()) diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index c25f2af536..618dd2c263 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -44,10 +44,10 @@ import com.android.settings.core.InstrumentedFragment; 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 @@ public class MasterClearConfirm extends InstrumentedFragment { * Configure the UI for the final confirmation interaction */ private void establishFinalConfirmationState() { - final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout); + final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout); final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class); mixin.setPrimaryButton( -- 2.11.0