Use SetupWizardLib helpers
Use SystemBarHelper, WizardManagerHelper and themes from Setup Wizard Library. Bug: 19594252 Change-Id: I60b6ab4f086a170ac270fb08325fc42010293523
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
package com.android.settings;
|
||||
|
||||
import com.android.setupwizard.navigationbar.SetupWizardNavBar;
|
||||
import com.android.setupwizardlib.util.SystemBarHelper;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
@@ -26,7 +27,6 @@ import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.WindowInsets;
|
||||
|
||||
/**
|
||||
* Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
|
||||
@@ -70,7 +70,7 @@ public class SetupChooseLockPassword extends ChooseLockPassword
|
||||
@Override
|
||||
public void onNavigationBarCreated(SetupWizardNavBar bar) {
|
||||
mNavigationBar = bar;
|
||||
SetupWizardUtils.setImmersiveMode(this, bar);
|
||||
SetupWizardUtils.setImmersiveMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -93,15 +93,14 @@ public class SetupChooseLockPassword extends ChooseLockPassword
|
||||
}
|
||||
}
|
||||
|
||||
public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment
|
||||
implements View.OnApplyWindowInsetsListener {
|
||||
public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
final View view = inflater.inflate(R.layout.setup_template, container, false);
|
||||
View scrollView = view.findViewById(R.id.bottom_scroll_view);
|
||||
scrollView.setOnApplyWindowInsetsListener(this);
|
||||
SystemBarHelper.setImeInsetView(scrollView);
|
||||
ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
|
||||
inflater.inflate(R.layout.setup_choose_lock_password, setupContent, true);
|
||||
return view;
|
||||
@@ -133,20 +132,5 @@ public class SetupChooseLockPassword extends ChooseLockPassword
|
||||
SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
|
||||
activity.mNavigationBar.getNextButton().setText(text);
|
||||
}
|
||||
|
||||
@Override
|
||||
public WindowInsets onApplyWindowInsets(View view, WindowInsets insets) {
|
||||
SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
|
||||
final int bottomMargin = Math.max(insets.getSystemWindowInsetBottom()
|
||||
- activity.mNavigationBar.getView().getHeight(), 0);
|
||||
ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
|
||||
lp.setMargins(lp.leftMargin, lp.topMargin, lp.rightMargin, bottomMargin);
|
||||
view.setLayoutParams(lp);
|
||||
return insets.replaceSystemWindowInsets(
|
||||
insets.getSystemWindowInsetLeft(),
|
||||
insets.getSystemWindowInsetTop(),
|
||||
insets.getSystemWindowInsetRight(),
|
||||
0 /* bottom */);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user