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

Commit 3688af69 authored by Antoan Angelov's avatar Antoan Angelov Committed by Android (Google) Code Review
Browse files

Merge "Enable ViewPager swiping for intent resolver."

parents 4eb7c729 8aa7f03a
Loading
Loading
Loading
Loading
+2 −12
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ import android.view.View;
import com.android.internal.widget.ViewPager;

/**
 * A {@link ViewPager} which wraps around its first child's height and has swiping disabled.
 * A {@link ViewPager} which wraps around its first child's height.
 * <p>Normally {@link ViewPager} instances expand their height to cover all remaining space in
 * the layout.
 * <p>This class is used for the intent resolver and share sheet's tabbed view.
 * <p>This class is used for the intent resolver's tabbed view.
 */
public class ResolverViewPager extends ViewPager {

@@ -70,14 +70,4 @@ public class ResolverViewPager extends ViewPager {
        heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
    }

    @Override
    public boolean onTouchEvent(MotionEvent ev) {
        return false;
    }

    @Override
    public boolean onInterceptTouchEvent(MotionEvent ev) {
        return false;
    }
}
+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@
                android:id="@android:id/tabcontent"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
                <com.android.internal.app.ResolverViewPager
                <com.android.internal.widget.ViewPager
                    android:id="@+id/profile_pager"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"/>