Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 082e7967 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Remove TemplateLayout that is not for external use"""

parents 755a7d5b 59f1c1ad

src/com/android/settings/MasterClear.java

+2 −2
Original line number Diff line number Diff line
@@ -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())

src/com/android/settings/MasterClearConfirm.java

+2 −2
Original line number Diff line number Diff line
@@ -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(