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

Commit 02158020 authored by Jason Monk's avatar Jason Monk
Browse files

QS: Handle detail scroll properly 

Add custom scrollview that ensures the touches can cause a scroll.

Change-Id: Ib18ac24ded11d06f59f582248964bd697652c192
Fixes: 28671167
parent 19d34821

packages/SystemUI/res/layout/qs_detail.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        />

        />





    <ScrollView

    <com.android.systemui.qs.NonInterceptingScrollView

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_height="0dp"

        android:layout_weight="1">

        android:layout_weight="1">
@@ -52,7 +52,7 @@ 
            android:id="@android:id/content"

            android:id="@android:id/content"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

            android:layout_height="wrap_content" />

    </ScrollView>

    </com.android.systemui.qs.NonInterceptingScrollView>





    <include layout="@layout/qs_detail_buttons" />

    <include layout="@layout/qs_detail_buttons" />

packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java

0 → 100644
+52 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

 * except in compliance with the License. You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software distributed under the

 * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

 * KIND, either express or implied. See the License for the specific language governing

 * permissions and limitations under the License.

 */



package com.android.systemui.qs;



import android.content.Context;

import android.util.AttributeSet;

import android.view.MotionEvent;

import android.widget.ScrollView;



/**

 * ScrollView that disallows intercepting for touches that can cause scrolling.

 */

public class NonInterceptingScrollView extends ScrollView {



    private float mInitialY;



    public NonInterceptingScrollView(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    @Override

    public boolean onTouchEvent(MotionEvent ev) {

        int action = ev.getActionMasked();

        switch (action) {

            case MotionEvent.ACTION_DOWN:

                mInitialY = ev.getY();

                break;

            case MotionEvent.ACTION_UP:

            case MotionEvent.ACTION_CANCEL:

                requestDisallowInterceptTouchEvent(false);

                break;

            default:

                if (canScrollVertically(ev.getY() > mInitialY ? -1 : 1)) {

                    requestDisallowInterceptTouchEvent(true);

                }

                break;

        }

        return super.onTouchEvent(ev);

    }

}