Merge "Always show divider between ranked and alphabetical apps" into udc-dev am: c5155ad573

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/23566839

Change-Id: Ia8875335e4e7276ce649abfa58df0c9bbbe0e195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 5 insertions, 37 deletions

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index a2dff970..c8062830 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -99,7 +99,6 @@ import com.android.intentresolver.model.ResolverRankerServiceResolverComparator;
 import com.android.intentresolver.shortcuts.AppPredictorFactory;
 import com.android.intentresolver.shortcuts.ShortcutLoader;
 import com.android.intentresolver.widget.ImagePreviewView;
-import com.android.intentresolver.widget.ResolverDrawerLayout;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -143,8 +142,6 @@ public class ChooserActivity extends ResolverActivity implements
      */
     public static final String FIRST_IMAGE_PREVIEW_TRANSITION_NAME = "screenshot_preview_image";
 
-    private static final String PREF_NUM_SHEET_EXPANSIONS = "pref_num_sheet_expansions";
-
     private static final boolean DEBUG = true;
 
     public static final String LAUNCH_LOCATION_DIRECT_SHARE = "direct_share";
@@ -323,21 +320,8 @@ public class ChooserActivity extends ResolverActivity implements
             mResolverDrawerLayout.addOnLayoutChangeListener(this::handleLayoutChange);
 
             mResolverDrawerLayout.setOnCollapsedChangedListener(
-                    new ResolverDrawerLayout.OnCollapsedChangedListener() {
-
-                        // Only consider one expansion per activity creation
-                        private boolean mWrittenOnce = false;
-
-                        @Override
-                        public void onCollapsedChanged(boolean isCollapsed) {
-                            if (!isCollapsed && !mWrittenOnce) {
-                                incrementNumSheetExpansions();
-                                mWrittenOnce = true;
-                            }
-                            getChooserActivityLogger()
-                                    .logSharesheetExpansionChanged(isCollapsed);
-                        }
-                    });
+                    isCollapsed ->
+                            getChooserActivityLogger().logSharesheetExpansionChanged(isCollapsed));
         }
 
         if (DEBUG) {
@@ -725,15 +709,6 @@ public class ChooserActivity extends ResolverActivity implements
         return resolver.query(uri, null, null, null, null);
     }
 
-    private int getNumSheetExpansions() {
-        return getPreferences(Context.MODE_PRIVATE).getInt(PREF_NUM_SHEET_EXPANSIONS, 0);
-    }
-
-    private void incrementNumSheetExpansions() {
-        getPreferences(Context.MODE_PRIVATE).edit().putInt(PREF_NUM_SHEET_EXPANSIONS,
-                getNumSheetExpansions() + 1).apply();
-    }
-
     @Override
     protected void onStop() {
         super.onStop();
@@ -1248,8 +1223,7 @@ public class ChooserActivity extends ResolverActivity implements
                 },
                 chooserListAdapter,
                 shouldShowContentPreview(),
-                mMaxTargetsPerRow,
-                getNumSheetExpansions());
+                mMaxTargetsPerRow);
     }
 
     @VisibleForTesting
diff --git a/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java b/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java
index e6f70d4f..8db03645 100644
--- a/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java
+++ b/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java
@@ -99,8 +99,6 @@ public final class ChooserGridAdapter extends RecyclerView.Adapter<RecyclerView.
     private static final int VIEW_TYPE_CALLER_AND_RANK = 5;
     private static final int VIEW_TYPE_FOOTER = 6;
 
-    private static final int NUM_EXPANSIONS_TO_HIDE_AZ_LABEL = 20;
-
     private final ChooserActivityDelegate mChooserActivityDelegate;
     private final ChooserListAdapter mChooserListAdapter;
     private final LayoutInflater mLayoutInflater;
@@ -109,7 +107,6 @@ public final class ChooserGridAdapter extends RecyclerView.Adapter<RecyclerView.
     private final boolean mShouldShowContentPreview;
     private final int mChooserWidthPixels;
     private final int mChooserRowTextOptionTranslatePixelSize;
-    private final boolean mShowAzLabelIfPoss;
 
     private int mChooserTargetWidth = 0;
 
@@ -120,8 +117,7 @@ public final class ChooserGridAdapter extends RecyclerView.Adapter<RecyclerView.
             ChooserActivityDelegate chooserActivityDelegate,
             ChooserListAdapter wrappedAdapter,
             boolean shouldShowContentPreview,
-            int maxTargetsPerRow,
-            int numSheetExpansions) {
+            int maxTargetsPerRow) {
         super();
 
         mChooserActivityDelegate = chooserActivityDelegate;
@@ -136,8 +132,6 @@ public final class ChooserGridAdapter extends RecyclerView.Adapter<RecyclerView.
         mChooserRowTextOptionTranslatePixelSize = context.getResources().getDimensionPixelSize(
                 R.dimen.chooser_row_text_option_translate);
 
-        mShowAzLabelIfPoss = numSheetExpansions < NUM_EXPANSIONS_TO_HIDE_AZ_LABEL;
-
         wrappedAdapter.registerDataSetObserver(new DataSetObserver() {
             @Override
             public void onChanged() {
@@ -243,7 +237,7 @@ public final class ChooserGridAdapter extends RecyclerView.Adapter<RecyclerView.
 
     public int getAzLabelRowCount() {
         // Only show a label if the a-z list is showing
-        return (mShowAzLabelIfPoss && mChooserListAdapter.getAlphaTargetCount() > 0) ? 1 : 0;
+        return (mChooserListAdapter.getAlphaTargetCount() > 0) ? 1 : 0;
     }
 
     @Override