Merge "Use the layout for calculating IME inset." into nyc-dev am: 24711aa63e

am: 824510e6f7

* commit '824510e6f72486b6b28567be2bd3b929f9c79bb5':
  Use the layout for calculating IME inset.

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());
         }