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

Merge "Sharesheet - Fix portrait -> landscape switch" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-05 05:33:13 +00:00
committed by Android (Google) Code Review
parent 68c570ecbc 399e8c74ee
commit 9620e07e4f
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1808,15 +1808,17 @@ public class ChooserActivity extends ResolverActivity {
offset += lastHeight; offset += lastHeight;
} }
if (lastHeight != 0 && isSendAction(getTargetIntent())) { boolean isPortrait = getResources().getConfiguration().orientation
== Configuration.ORIENTATION_PORTRAIT;
if (lastHeight != 0 && isSendAction(getTargetIntent()) && isPortrait) {
// make sure to leave room for direct share 4->8 expansion // make sure to leave room for direct share 4->8 expansion
int expansionArea = int expansionArea =
(int) (mResolverDrawerLayout.getUncollapsibleHeight() (int) (mResolverDrawerLayout.getAlwaysShowHeight()
/ DIRECT_SHARE_EXPANSION_RATE); / DIRECT_SHARE_EXPANSION_RATE);
offset = Math.min(offset, bottom - top - lastHeight - expansionArea); offset = Math.min(offset, bottom - top - lastHeight - expansionArea);
} }
mResolverDrawerLayout.setCollapsibleHeightReserved(offset); mResolverDrawerLayout.setCollapsibleHeightReserved(Math.min(offset, bottom - top));
}); });
} }
} }

9
core/java/com/android/internal/widget/ResolverDrawerLayout.java
View File

@@ -75,6 +75,7 @@ public class ResolverDrawerLayout extends ViewGroup {
private int mCollapsibleHeight; private int mCollapsibleHeight;
private int mUncollapsibleHeight; private int mUncollapsibleHeight;
private int mAlwaysShowHeight;
/** /**
* The height in pixels of reserved space added to the top of the collapsed UI; * The height in pixels of reserved space added to the top of the collapsed UI;
@@ -832,7 +833,7 @@ public class ResolverDrawerLayout extends ViewGroup {
} }
} }
final int alwaysShowHeight = heightUsed; mAlwaysShowHeight = heightUsed;
// And now the rest. // And now the rest.
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
@@ -854,7 +855,7 @@ public class ResolverDrawerLayout extends ViewGroup {
final int oldCollapsibleHeight = mCollapsibleHeight; final int oldCollapsibleHeight = mCollapsibleHeight;
mCollapsibleHeight = Math.max(0, mCollapsibleHeight = Math.max(0,
heightUsed - alwaysShowHeight - getMaxCollapsedHeight()); heightUsed - mAlwaysShowHeight - getMaxCollapsedHeight());
mUncollapsibleHeight = heightUsed - mCollapsibleHeight; mUncollapsibleHeight = heightUsed - mCollapsibleHeight;
updateCollapseOffset(oldCollapsibleHeight, !isDragging()); updateCollapseOffset(oldCollapsibleHeight, !isDragging());
@@ -871,8 +872,8 @@ public class ResolverDrawerLayout extends ViewGroup {
/** /**
* @return The space reserved by views with 'alwaysShow=true' * @return The space reserved by views with 'alwaysShow=true'
*/ */
public int getUncollapsibleHeight() { public int getAlwaysShowHeight() {
return mUncollapsibleHeight; return mAlwaysShowHeight;
} }
@Override @Override