diff options
| author | 2023-04-13 00:20:39 +0000 | |
|---|---|---|
| committer | 2023-04-13 00:20:39 +0000 | |
| commit | 80d24aac13dbcd61fb4e6ccac9d10290c92ae0db (patch) | |
| tree | 1e412c8d8f3727479065ee99f63023737393c1e4 /java/src | |
| parent | 727786829cd1e5807a08aea4e0ada07b0d373d37 (diff) | |
| parent | e4b579ed91c7c714bcec35fef4501f92a3446bf7 (diff) | |
Merge "Calculare direct share expansion height only if epansion is enabled" into udc-dev am: e4b579ed91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22471902
Change-Id: Ifaf46d7d8b2fd57b733058b78483d3f732f57174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserActivity.java | 11 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/grid/ChooserGridAdapter.java | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java index dd0be4f0..dc9ba5ee 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -1512,11 +1512,12 @@ public class ChooserActivity extends ResolverActivity implements rowsToShow--; } - boolean isExpandable = getResources().getConfiguration().orientation - == Configuration.ORIENTATION_PORTRAIT && !isInMultiWindowMode(); - if (directShareHeight != 0 && shouldShowContentPreview() - && isExpandable) { - // make sure to leave room for direct share 4->8 expansion + boolean isPortrait = getResources().getConfiguration().orientation + == Configuration.ORIENTATION_PORTRAIT; + boolean isExpandable = isPortrait && !isInMultiWindowMode() + && gridAdapter.canExpandDirectShare(); + if (directShareHeight != 0 && shouldShowContentPreview() && isExpandable) { + // make sure to leave room for direct share 4->8 expansion, if enabled int requiredExpansionHeight = (int) (directShareHeight / DIRECT_SHARE_EXPANSION_RATE); int topInset = mSystemWindowInsets != null ? mSystemWindowInsets.top : 0; diff --git a/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java b/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java index 1cf59316..96f8c4d1 100644 --- a/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java +++ b/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java @@ -581,7 +581,7 @@ public final class ChooserGridAdapter extends RecyclerView.Adapter<RecyclerView. } /** Only expand direct share area if there is a minimum number of targets. */ - private boolean canExpandDirectShare() { + public boolean canExpandDirectShare() { // Do not enable until we have confirmed more apps are using sharing shortcuts // Check git history for enablement logic return false; |