Merge "[DO NOT MERGE] Resolver/Chooser - Window inset fixes" into qt-qpr1-dev (2c5bd63e) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -2562,6 +2562,12 @@ public class ChooserActivity extends ResolverActivity {
		}
		}

		@Override
		protected boolean shouldAddFooterView() {
		// To accommodate for window insets
		return true;
		}

		public class ChooserListAdapter extends ResolveListAdapter {
		public static final int TARGET_BAD = -1;
		public static final int TARGET_CALLER = 0;

+17 −3

Original line number	Diff line number	Diff line
		@@ -382,14 +382,30 @@ public class ResolverActivity extends Activity {
		finish();
		}

		/**
		* Numerous layouts are supported, each with optional ViewGroups.
		* Make sure the inset gets added to the correct View, using
		* a footer for Lists so it can properly scroll under the navbar.
		*/
		protected boolean shouldAddFooterView() {
		if (useLayoutWithDefault()) return true;

		View buttonBar = findViewById(R.id.button_bar);
		if (buttonBar == null \|\| buttonBar.getVisibility() == View.GONE) return true;

		return false;
		}

		protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
		mSystemWindowInsets = insets.getSystemWindowInsets();

		mResolverDrawerLayout.setPadding(mSystemWindowInsets.left, mSystemWindowInsets.top,
		mSystemWindowInsets.right, 0);

		resetButtonBar();

		// Need extra padding so the list can fully scroll up
		if (useLayoutWithDefault()) {
		if (shouldAddFooterView()) {
		if (mFooterSpacer == null) {
		mFooterSpacer = new Space(getApplicationContext());
		} else {
		@@ -407,8 +423,6 @@ public class ResolverActivity extends Activity {
		}
		}

		resetButtonBar();

		return insets.consumeSystemWindowInsets();
		}