From 030bd8471fbd3f5c576574428d7b4fc08853a087 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Wed, 29 May 2019 07:14:14 -0400 Subject: [PATCH] Sharesheet - Add additional checks for low ram devices Continue to hide the direct share area for low ram devices. Make sure the A-Z list loads properly. Bug: 132342311 Test: Use low ram device Change-Id: I66b58af3994e034e4d870286ef62ba4a9289e083 --- core/java/com/android/internal/app/ChooserActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index fca97fee603e3..7eb3dab9f344d 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -1603,7 +1603,8 @@ public class ChooserActivity extends ResolverActivity { */ @Nullable private AppPredictor getAppPredictorForDirectShareIfEnabled() { - return USE_PREDICTION_MANAGER_FOR_DIRECT_TARGETS ? getAppPredictor() : null; + return USE_PREDICTION_MANAGER_FOR_DIRECT_TARGETS && !ActivityManager.isLowRamDeviceStatic() + ? getAppPredictor() : null; } /** @@ -2349,6 +2350,8 @@ public class ChooserActivity extends ResolverActivity { @Override public void onListRebuilt() { + updateAlphabeticalList(); + // don't support direct share on low ram devices if (ActivityManager.isLowRamDeviceStatic()) { return; @@ -2379,7 +2382,6 @@ public class ChooserActivity extends ResolverActivity { queryTargetServices(this); } - updateAlphabeticalList(); } @Override @@ -2830,7 +2832,7 @@ public class ChooserActivity extends ResolverActivity { // There can be at most one row in the listview, that is internally // a ViewGroup with 2 rows public int getServiceTargetRowCount() { - if (isSendAction(getTargetIntent())) { + if (isSendAction(getTargetIntent()) && !ActivityManager.isLowRamDeviceStatic()) { return 1; } return 0;