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

Commit 60e40035 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Remove QS drag handle" into sc-dev am: a900a21a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14188977

Change-Id: Ie126e640b02f4a9db92a206e8c142cf628c100c0
parents f7c415bc a900a21a

packages/SystemUI/res/drawable/qs_footer_drag_handle.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 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.

-->

<shape

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

    android:shape="rectangle" >

    <solid

        android:color="?android:attr/textColorSecondary" />

    <corners android:radius="2dp" />

</shape>

packages/SystemUI/res/layout/qs_panel.xml

+0 −14
Original line number Diff line number Diff line
@@ -56,18 +56,4 @@ 
    <include android:id="@+id/qs_customize" layout="@layout/qs_customize_panel"

        android:visibility="gone" />



    <FrameLayout

        android:id="@+id/qs_drag_handle_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:elevation="4dp"

        android:paddingBottom="5dp">

        <View

            android:layout_width="46dp"

            android:layout_height="3dp"

            android:background="@drawable/qs_footer_drag_handle" />

    </FrameLayout>





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

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

+0 −5
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ public class QSContainerImpl extends FrameLayout { 
    private QuickStatusBarHeader mHeader;

    private float mQsExpansion;

    private QSCustomizer mQSCustomizer;

    private View mDragHandle;

    private NonInterceptingScrollView mQSPanelContainer;



    private View mBackground;
@@ -83,7 +82,6 @@ public class QSContainerImpl extends FrameLayout { 
        mQSDetail = findViewById(R.id.qs_detail);

        mHeader = findViewById(R.id.header);

        mQSCustomizer = findViewById(R.id.qs_customize);

        mDragHandle = findViewById(R.id.qs_drag_handle_view);

        mBackground = findViewById(R.id.quick_settings_background);

        mHeader.getHeaderQsPanel().setMediaVisibilityChangedListener((visible) -> {

            if (mHeader.getHeaderQsPanel().isShown()) {
@@ -239,8 +237,6 @@ public class QSContainerImpl extends FrameLayout { 
        int scrollBottom = calculateContainerBottom();

        setBottom(getTop() + height);

        mQSDetail.setBottom(getTop() + scrollBottom);

        // Pin the drag handle to the bottom of the panel.

        mDragHandle.setTranslationY(scrollBottom - mDragHandle.getHeight());

        mBackground.setTop(mQSPanelContainer.getTop());

        updateBackgroundBottom(scrollBottom, animate);

    }
@@ -277,7 +273,6 @@ public class QSContainerImpl extends FrameLayout { 


    public void setExpansion(float expansion) {

        mQsExpansion = expansion;

        mDragHandle.setAlpha(1.0f - expansion);

        updateExpansion();

    }