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

Commit 11b91572 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Using Support-Lib's fast scroller, removing Files' app's own."

parents 90b88500 44636376

res/layout/fragment_directory.xml

+7 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<com.android.documentsui.dirlist.AnimationView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/directory_background"
@@ -46,7 +47,12 @@ 
            android:paddingBottom="0dp"

            android:clipToPadding="false"

            android:scrollbars="none"

            android:drawSelectorOnTop="true"/>

            android:drawSelectorOnTop="true"

            app:fastScrollEnabled="true"

            app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb_drawable"

            app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track_drawable"

            app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb_drawable"

            app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track_drawable"/>



    </com.android.documentsui.dirlist.DocumentsSwipeRefreshLayout>

src/com/android/documentsui/dirlist/DirectoryFragment.java

+0 −13
Original line number Diff line number Diff line
@@ -33,9 +33,7 @@ import android.app.FragmentManager; 
import android.app.FragmentTransaction;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.database.Cursor;

import android.graphics.drawable.StateListDrawable;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;
@@ -218,17 +216,6 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On 


        mRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.refresh_layout);

        mRefreshLayout.setOnRefreshListener(this);



        Resources resources = getContext().getResources();

        new FastScroller(mRecView,

                (StateListDrawable) resources.getDrawable(R.drawable.fast_scroll_thumb_drawable),

                resources.getDrawable(R.drawable.fast_scroll_track_drawable),

                (StateListDrawable) resources.getDrawable(R.drawable.fast_scroll_thumb_drawable),

                resources.getDrawable(R.drawable.fast_scroll_track_drawable),

                resources.getDimensionPixelSize(R.dimen.fastscroll_default_thickness),

                resources.getDimensionPixelSize(R.dimen.fastscroll_minimum_range),

                resources.getDimensionPixelOffset(R.dimen.fastscroll_margin)

                );

        mRecView.setItemAnimator(new DirectoryItemAnimator(mActivity));



        mInjector = mActivity.getInjector();

src/com/android/documentsui/dirlist/FastScroller.java

deleted100644 → 0
+0 −583

File deleted.

Preview size limit exceeded, changes collapsed.