Merge "Make statusBarColor and navBarColor transparent for Theme.DeviceDefault.Settings" into qt-dev
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index fca97fe..7eb3dab 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -1603,7 +1603,8 @@
*/
@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 @@
@Override
public void onListRebuilt() {
+ updateAlphabeticalList();
+
// don't support direct share on low ram devices
if (ActivityManager.isLowRamDeviceStatic()) {
return;
@@ -2379,7 +2382,6 @@
queryTargetServices(this);
}
- updateAlphabeticalList();
}
@Override
@@ -2830,7 +2832,7 @@
// 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;