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

Commit c3553372 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Sharesheet - Scrolling UI adjustments" into qt-dev

parents 993e5dac b1d629dc

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

+22 −0
Original line number Diff line number Diff line
@@ -480,6 +480,28 @@ public class ChooserActivity extends ResolverActivity { 
            if (isSendAction(target)) {

                mResolverDrawerLayout.setOnScrollChangeListener(this::handleScroll);

            }



            final View chooserHeader = mResolverDrawerLayout.findViewById(R.id.chooser_header);

            final float defaultElevation = chooserHeader.getElevation();

            final float chooserHeaderScrollElevation =

                    getResources().getDimensionPixelSize(R.dimen.chooser_header_scroll_elevation);



            mAdapterView.setOnScrollListener(new AbsListView.OnScrollListener() {

                public void onScrollStateChanged(AbsListView view, int scrollState) {

                }



                public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,

                        int totalItemCount) {

                    if (view.getChildCount() > 0) {

                        if (firstVisibleItem > 0 || view.getChildAt(0).getTop() < 0) {

                            chooserHeader.setElevation(chooserHeaderScrollElevation);

                            return;

                        }

                    }



                    chooserHeader.setElevation(defaultElevation);

                }

            });

        }



        if (DEBUG) {

core/res/res/layout/chooser_grid.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    android:id="@id/contentPanel">



    <RelativeLayout

        android:id="@+id/chooser_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alwaysShow="true"
@@ -62,11 +63,10 @@ 
        android:layout_height="match_parent"

        android:id="@+id/resolver_list"

        android:clipToPadding="false"

        android:scrollbarStyle="outsideOverlay"

        android:background="?attr/colorBackgroundFloating"

        android:scrollbars="none"

        android:listSelector="@color/transparent"

        android:divider="@null"

        android:scrollIndicators="top"

        android:elevation="1dp"

        android:nestedScrollingEnabled="true"/>

core/res/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -734,5 +734,6 @@ 
    <dimen name="resolver_icon_size">42dp</dimen>

    <dimen name="resolver_badge_size">18dp</dimen>

    <dimen name="chooser_target_width">90dp</dimen>

    <dimen name="chooser_header_scroll_elevation">4dp</dimen>

    <dimen name="chooser_max_collapsed_height">288dp</dimen>

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2786,6 +2786,8 @@ 
  <java-symbol type="dimen" name="chooser_preview_image_border"/>

  <java-symbol type="dimen" name="chooser_max_collapsed_height" />

  <java-symbol type="layout" name="chooser_grid" />

  <java-symbol type="id" name="chooser_header" />

  <java-symbol type="dimen" name="chooser_header_scroll_elevation" />

  <java-symbol type="layout" name="chooser_grid_preview_text" />

  <java-symbol type="layout" name="chooser_grid_preview_image" />

  <java-symbol type="layout" name="chooser_grid_preview_file" />