Merge "Sharesheet - Crash during work profile share" (26eb022b) · Commits · e / os / android_frameworks_base

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

+6 −11

Original line number	Diff line number	Diff line
		@@ -2434,11 +2434,6 @@ public class ChooserActivity extends ResolverActivity implements
		FooterViewHolder(View itemView) {
		super(itemView);
		}

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

		/**
		@@ -2471,7 +2466,7 @@ public class ChooserActivity extends ResolverActivity implements

		private boolean mLayoutRequested = false;

		private FooterViewHolder mFooterViewHolder;
		private int mFooterHeight = 0;

		private static final int VIEW_TYPE_DIRECT_SHARE = 0;
		private static final int VIEW_TYPE_NORMAL = 1;
		@@ -2490,9 +2485,6 @@ 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() {
		@@ -2511,7 +2503,7 @@ public class ChooserActivity extends ResolverActivity implements
		}

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

		/**
		@@ -2614,7 +2606,10 @@ public class ChooserActivity extends ResolverActivity implements
		case VIEW_TYPE_CALLER_AND_RANK:
		return createItemGroupViewHolder(viewType, parent);
		case VIEW_TYPE_FOOTER:
		return mFooterViewHolder;
		Space sp = new Space(parent.getContext());
		sp.setLayoutParams(new RecyclerView.LayoutParams(
		LayoutParams.MATCH_PARENT, mFooterHeight));
		return new FooterViewHolder(sp);
		default:
		// Since we catch all possible viewTypes above, no chance this is being called.
		return null;

core/java/com/android/internal/widget/ResolverDrawerLayout.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public class ResolverDrawerLayout extends ViewGroup {

		public void setCollapsed(boolean collapsed) {
		if (!isLaidOut()) {
		mOpenOnLayout = collapsed;
		mOpenOnLayout = !collapsed;
		} else {
		smoothScrollTo(collapsed ? mCollapsibleHeight : 0, 0);
		}