Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 849a9d13 authored by Mike Digman's avatar Mike Digman
Browse files

Sharesheet - make az list label disappear with use 

Following example set by launcher, eventually make a-z list
label disappear after n expansions. Done with the Sharedpref
associated with ChooserActivity.

Test: manual
Fixes: 130349817
Change-Id: I2b05982654265804bbc1b3e4821f05ced1e011cd
parent ae730b1f

core/java/com/android/internal/app/ChooserActivity.java

+33 −1
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.util.ImageUtils;

import com.android.internal.widget.ResolverDrawerLayout;



import com.google.android.collect.Lists;
@@ -143,6 +144,8 @@ public class ChooserActivity extends ResolverActivity { 
    public static final String EXTRA_PRIVATE_RETAIN_IN_ON_STOP

            = "com.android.internal.app.ChooserActivity.EXTRA_PRIVATE_RETAIN_IN_ON_STOP";



    private static final String PREF_NUM_SHEET_EXPANSIONS = "pref_num_sheet_expansions";



    private static final boolean DEBUG = false;



    /**
@@ -502,6 +505,21 @@ public class ChooserActivity extends ResolverActivity { 
                    chooserHeader.setElevation(defaultElevation);

                }

            });



            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;

                            }

                        }

                    });

        }



        if (DEBUG) {
@@ -881,6 +899,15 @@ public class ChooserActivity extends ResolverActivity { 
        return CONTENT_PREVIEW_TEXT;

    }



    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 onDestroy() {

        super.onDestroy();
@@ -2491,6 +2518,7 @@ public class ChooserActivity extends ResolverActivity { 


        private DirectShareViewHolder mDirectShareViewHolder;

        private int mChooserTargetWidth = 0;

        private boolean mShowAzLabelIfPoss;



        private static final int VIEW_TYPE_DIRECT_SHARE = 0;

        private static final int VIEW_TYPE_NORMAL = 1;
@@ -2501,10 +2529,14 @@ public class ChooserActivity extends ResolverActivity { 
        private static final int MAX_TARGETS_PER_ROW_PORTRAIT = 4;

        private static final int MAX_TARGETS_PER_ROW_LANDSCAPE = 8;



        private static final int NUM_EXPANSIONS_TO_HIDE_AZ_LABEL = 20;



        public ChooserRowAdapter(ChooserListAdapter wrappedAdapter) {

            mChooserListAdapter = wrappedAdapter;

            mLayoutInflater = LayoutInflater.from(ChooserActivity.this);



            mShowAzLabelIfPoss = getNumSheetExpansions() < NUM_EXPANSIONS_TO_HIDE_AZ_LABEL;



            wrappedAdapter.registerDataSetObserver(new DataSetObserver() {

                @Override

                public void onChanged() {
@@ -2597,7 +2629,7 @@ public class ChooserActivity extends ResolverActivity { 


        public int getAzLabelRowCount() {

            // Only show a label if the a-z list is showing

            return mChooserListAdapter.getAlphaTargetCount() > 0 ? 1 : 0;

            return (mShowAzLabelIfPoss && mChooserListAdapter.getAlphaTargetCount() > 0) ? 1 : 0;

        }



        @Override

core/java/com/android/internal/widget/ResolverDrawerLayout.java

+27 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ public class ResolverDrawerLayout extends ViewGroup { 


    private OnDismissedListener mOnDismissedListener;

    private RunOnDismissedListener mRunOnDismissedListener;

    private OnCollapsedChangedListener mOnCollapsedChangedListener;



    private boolean mDismissLocked;
@@ -267,6 +268,10 @@ public class ResolverDrawerLayout extends ViewGroup { 
        return mOnDismissedListener != null && !mDismissLocked;

    }



    public void setOnCollapsedChangedListener(OnCollapsedChangedListener listener) {

        mOnCollapsedChangedListener = listener;

    }



    @Override

    public boolean onInterceptTouchEvent(MotionEvent ev) {

        final int action = ev.getActionMasked();
@@ -548,6 +553,10 @@ public class ResolverDrawerLayout extends ViewGroup { 
        if (mScrollIndicatorDrawable != null) {

            setWillNotDraw(!isCollapsed);

        }



        if (mOnCollapsedChangedListener != null) {

            mOnCollapsedChangedListener.onCollapsedChanged(isCollapsed);

        }

    }



    void dispatchOnDismissed() {
@@ -1078,8 +1087,25 @@ public class ResolverDrawerLayout extends ViewGroup { 
        };

    }



    /**

     * Listener for sheet dismissed events.

     */

    public interface OnDismissedListener {

        public void onDismissed();

        /**

         * Callback when the sheet is dismissed by the user.

         */

        void onDismissed();

    }



    /**

     * Listener for sheet collapsed / expanded events.

     */

    public interface OnCollapsedChangedListener {

        /**

         * Callback when the sheet is either fully expanded or collapsed.

         * @param isCollapsed true when collapsed, false when expanded.

         */

        void onCollapsedChanged(boolean isCollapsed);

    }



    private class RunOnDismissedListener implements Runnable {