Merge "Resolver/Chooser - Window inset fixes" (1fd8c7cc) · Commits · e / os / android_frameworks_base

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

+45 −6

Original line number	Diff line number	Diff line
		@@ -98,10 +98,10 @@ import android.view.View.OnClickListener;
		import android.view.View.OnLongClickListener;
		import android.view.ViewGroup;
		import android.view.ViewGroup.LayoutParams;
		import android.view.WindowInsets;
		import android.view.animation.AccelerateInterpolator;
		import android.view.animation.DecelerateInterpolator;
		import android.widget.ImageView;
		import android.widget.Space;
		import android.widget.TextView;
		import android.widget.Toast;

		@@ -1546,6 +1546,21 @@ public class ChooserActivity extends ResolverActivity implements
		return -1;
		}

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

		@Override
		protected void applyFooterView(int height) {
		int count = mChooserMultiProfilePagerAdapter.getItemCount();

		for (int i = 0; i < count; i++) {
		mChooserMultiProfilePagerAdapter.getAdapterForIndex(i).setFooterHeight(height);
		}
		}

		void queryTargetServices(ChooserListAdapter adapter) {
		mQueriedTargetServicesTimeMs = System.currentTimeMillis();

		@@ -2413,12 +2428,17 @@ public class ChooserActivity extends ResolverActivity implements
		}

		/**
		* Intentionally override the {@link ResolverActivity} implementation as we only need that
		* implementation for the intent resolver case.
		* Add a footer to the list, to support scrolling behavior below the navbar.
		*/
		@Override
		protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
		return insets.consumeSystemWindowInsets();
		final class FooterViewHolder extends RecyclerView.ViewHolder {
		FooterViewHolder(View itemView) {
		super(itemView);
		}

		public void setHeight(int height) {
		itemView.setLayoutParams(
		new RecyclerView.LayoutParams(LayoutParams.MATCH_PARENT, height));
		}
		}

		/**
		@@ -2451,11 +2471,14 @@ public class ChooserActivity extends ResolverActivity implements

		private boolean mLayoutRequested = false;

		private FooterViewHolder mFooterViewHolder;

		private static final int VIEW_TYPE_DIRECT_SHARE = 0;
		private static final int VIEW_TYPE_NORMAL = 1;
		private static final int VIEW_TYPE_PROFILE = 2;
		private static final int VIEW_TYPE_AZ_LABEL = 3;
		private static final int VIEW_TYPE_CALLER_AND_RANK = 4;
		private static final int VIEW_TYPE_FOOTER = 5;

		private static final int MAX_TARGETS_PER_ROW_PORTRAIT = 4;
		private static final int MAX_TARGETS_PER_ROW_LANDSCAPE = 8;
		@@ -2467,6 +2490,9 @@ public class ChooserActivity extends ResolverActivity implements
		mChooserListAdapter = wrappedAdapter;
		mLayoutInflater = LayoutInflater.from(ChooserActivity.this);

		mFooterViewHolder = new FooterViewHolder(
		new Space(ChooserActivity.this.getApplicationContext()));

		mShowAzLabelIfPoss = getNumSheetExpansions() < NUM_EXPANSIONS_TO_HIDE_AZ_LABEL;

		wrappedAdapter.registerDataSetObserver(new DataSetObserver() {
		@@ -2484,6 +2510,10 @@ public class ChooserActivity extends ResolverActivity implements
		});
		}

		public void setFooterHeight(int height) {
		mFooterViewHolder.setHeight(height);
		}

		/**
		* Calculate the chooser target width to maximize space per item
		*
		@@ -2534,6 +2564,10 @@ public class ChooserActivity extends ResolverActivity implements
		return mChooserListAdapter.getOtherProfile() == null ? 0 : 1;
		}

		public int getFooterRowCount() {
		return 1;
		}

		public int getCallerAndRankedTargetRowCount() {
		return (int) Math.ceil(
		((float) mChooserListAdapter.getCallerTargetCount()
		@@ -2563,6 +2597,7 @@ public class ChooserActivity extends ResolverActivity implements
		+ getCallerAndRankedTargetRowCount()
		+ getAzLabelRowCount()
		+ mChooserListAdapter.getAlphaTargetCount()
		+ getFooterRowCount()
		);
		}

		@@ -2578,6 +2613,8 @@ public class ChooserActivity extends ResolverActivity implements
		case VIEW_TYPE_DIRECT_SHARE:
		case VIEW_TYPE_CALLER_AND_RANK:
		return createItemGroupViewHolder(viewType, parent);
		case VIEW_TYPE_FOOTER:
		return mFooterViewHolder;
		default:
		// Since we catch all possible viewTypes above, no chance this is being called.
		return null;
		@@ -2615,6 +2652,8 @@ public class ChooserActivity extends ResolverActivity implements
		countSum += (count = getAzLabelRowCount());
		if (count > 0 && position < countSum) return VIEW_TYPE_AZ_LABEL;

		if (position == getItemCount() - 1) return VIEW_TYPE_FOOTER;

		return VIEW_TYPE_NORMAL;
		}

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

+37 −19

Original line number	Diff line number	Diff line
		@@ -472,14 +472,21 @@ public class ResolverActivity extends Activity implements
		finish();
		}

		protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
		mSystemWindowInsets = insets.getSystemWindowInsets();
		/**
		* 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;

		mResolverDrawerLayout.setPadding(mSystemWindowInsets.left, mSystemWindowInsets.top,
		mSystemWindowInsets.right, 0);
		View buttonBar = findViewById(R.id.button_bar);
		if (buttonBar == null \|\| buttonBar.getVisibility() == View.GONE) return true;

		// Need extra padding so the list can fully scroll up
		if (useLayoutWithDefault()) {
		return false;
		}

		protected void applyFooterView(int height) {
		if (mFooterSpacer == null) {
		mFooterSpacer = new Space(getApplicationContext());
		} else {
		@@ -490,16 +497,27 @@ public class ResolverActivity extends Activity implements
		mSystemWindowInsets.bottom));
		((ResolverMultiProfilePagerAdapter) mMultiProfilePagerAdapter)
		.getCurrentAdapterView().addFooterView(mFooterSpacer);
		} else {
		}

		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 (shouldAddFooterView()) {
		applyFooterView(mSystemWindowInsets.bottom);
		}

		View emptyView = findViewById(R.id.empty);
		if (emptyView != null) {
		emptyView.setPadding(0, 0, 0, mSystemWindowInsets.bottom
		+ getResources().getDimensionPixelSize(
		R.dimen.chooser_edge_margin_normal) * 2);
		}
		}

		resetButtonBar();

		return insets.consumeSystemWindowInsets();
		}