Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sharesheet - 4->8 direct share expansion fix" into qt-dev

Browse Source
This commit is contained in:
Matt Pietal
2019-04-11 15:30:34 +00:00
committed by Android (Google) Code Review
parent 71d3450762 a9c8e5053a
commit 43e9ec2354
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2545,8 +2545,8 @@ public class ChooserActivity extends ResolverActivity {
if (isDirectShare) {
DirectShareViewHolder dsvh = (DirectShareViewHolder) holder;
setViewHeight(dsvh.getRow(0), holder.getMeasuredRowHeight());
setViewHeight(dsvh.getRow(1), holder.getMeasuredRowHeight());
setViewHeight(dsvh.getRow(0), dsvh.getMinRowHeight());
setViewHeight(dsvh.getRow(1), dsvh.getMinRowHeight());
}
viewGroup.setTag(holder);
@@ -2828,6 +2828,10 @@ public class ChooserActivity extends ResolverActivity {
return mDirectShareCurrHeight;
}
public int getMinRowHeight() {
return mDirectShareMinHeight;
}
public void setViewVisibility(int i, int visibility) {
final View v = getView(i);
if (visibility == View.VISIBLE) {
@@ -2850,15 +2854,20 @@ public class ChooserActivity extends ResolverActivity {
}
public void handleScroll(AbsListView view, int y, int oldy, int maxTargetsPerRow) {
if (mHideDirectShareExpansion) {
return;
}
// only exit early if fully collapsed, otherwise onListRebuilt() with shifting
// targets can lock us into an expanded mode
boolean notExpanded = mDirectShareCurrHeight == mDirectShareMinHeight;
if (notExpanded) {
if (mHideDirectShareExpansion) {
return;
}
// only expand if we have more than maxTargetsPerRow, and delay that decision
// until they start to scroll
if (mChooserListAdapter.getSelectableServiceTargetCount() <= maxTargetsPerRow) {
mHideDirectShareExpansion = true;
return;
// only expand if we have more than maxTargetsPerRow, and delay that decision
// until they start to scroll
if (mChooserListAdapter.getSelectableServiceTargetCount() <= maxTargetsPerRow) {
mHideDirectShareExpansion = true;
return;
}
}
int yDiff = (int) ((oldy - y) * DIRECT_SHARE_EXPANSION_RATE);