From 2b7d99782fd7823b47d24bb16c5e51e104290412 Mon Sep 17 00:00:00 2001 From: Udam Saini Date: Mon, 22 Feb 2016 14:51:44 -0800 Subject: [PATCH] Use the layout for calculating IME inset. We should calculate the offset for the entire layout rather than just the scroll view. This allows us to not special case the navigation bar inside SystemBarHelper.setImeInsetView, as the logic before always assumed the scroll view was passed into setImeInsetView. bug:27063940 Change-Id: If3f09e1e07ea584097a050b987c1ab3985b4991c --- src/com/android/settings/SetupChooseLockPassword.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java index d9b034b8293..e1e0d51ae29 100644 --- a/src/com/android/settings/SetupChooseLockPassword.java +++ b/src/com/android/settings/SetupChooseLockPassword.java @@ -102,7 +102,7 @@ public class SetupChooseLockPassword extends ChooseLockPassword { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - SystemBarHelper.setImeInsetView(mLayout.findViewById(R.id.suw_bottom_scroll_view)); + SystemBarHelper.setImeInsetView(mLayout); SetupWizardUtils.setImmersiveMode(getActivity()); mLayout.setHeaderText(getActivity().getTitle()); }