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

Commit bd0b819c authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Add divider between QS and media" into rvc-dev

parents 74e4018f 42c541e6

packages/SystemUI/res-keyguard/layout/qs_media_divider.xml

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

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

    android:layout_width="match_parent"

    android:layout_height="1dp"

    android:layout_marginBottom="16dp"

    android:background="@color/media_divider">

</View>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_panel.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,8 @@ 
            android:focusable="true"

            android:focusable="true"

            android:accessibilityTraversalBefore="@android:id/edit">

            android:accessibilityTraversalBefore="@android:id/edit">

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

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

            <include layout="@layout/qs_media_divider"

                android:id="@+id/divider"/>

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

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

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

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

packages/SystemUI/res/values-night/colors.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,8 @@ 
    <color name="global_screenshot_dismiss_foreground">#FFFFFF</color>

    <color name="global_screenshot_dismiss_foreground">#FFFFFF</color>

    <color name="global_screenshot_background_protection_start">#80000000</color> <!-- 50% black -->

    <color name="global_screenshot_background_protection_start">#80000000</color> <!-- 50% black -->





    <!-- Media -->

    <color name="media_divider">#85ffffff</color>





    <!-- Biometric dialog colors -->

    <!-- Biometric dialog colors -->

    <color name="biometric_dialog_gray">#ff888888</color>

    <color name="biometric_dialog_gray">#ff888888</color>

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -249,6 +249,7 @@ 
    <color name="media_seekbar_progress">#c0ffffff</color>

    <color name="media_seekbar_progress">#c0ffffff</color>

    <color name="media_disabled">#80ffffff</color>

    <color name="media_disabled">#80ffffff</color>

    <color name="media_seamless_border">#26ffffff</color> <!-- 15% -->

    <color name="media_seamless_border">#26ffffff</color> <!-- 15% -->

    <color name="media_divider">#1d000000</color>





    <!-- controls -->

    <!-- controls -->

    <color name="control_primary_text">#E6FFFFFF</color>

    <color name="control_primary_text">#E6FFFFFF</color>

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ import android.util.Log; 
import android.view.View;

import android.view.View;

import android.view.View.OnAttachStateChangeListener;

import android.view.View.OnAttachStateChangeListener;

import android.view.View.OnLayoutChangeListener;

import android.view.View.OnLayoutChangeListener;

import android.widget.ScrollView;





import com.android.systemui.Dependency;

import com.android.systemui.Dependency;

import com.android.systemui.plugins.qs.QS;

import com.android.systemui.plugins.qs.QS;
@@ -300,10 +299,16 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
            if (mQsPanel.getSecurityFooter() != null) {

            if (mQsPanel.getSecurityFooter() != null) {

                builder.addFloat(mQsPanel.getSecurityFooter().getView(), "alpha", 0, 1);

                builder.addFloat(mQsPanel.getSecurityFooter().getView(), "alpha", 0, 1);

            }

            }

            if (mQsPanel.getDivider() != null) {

                builder.addFloat(mQsPanel.getDivider(), "alpha", 0, 1);

            }

            mFirstPageDelayedAnimator = builder.build();

            mFirstPageDelayedAnimator = builder.build();

            if (mQsPanel.getSecurityFooter() != null) {

            if (mQsPanel.getSecurityFooter() != null) {

                mAllViews.add(mQsPanel.getSecurityFooter().getView());

                mAllViews.add(mQsPanel.getSecurityFooter().getView());

            }

            }

            if (mQsPanel.getDivider() != null) {

                mAllViews.add(mQsPanel.getDivider());

            }

            float px = 0;

            float px = 0;

            float py = 1;

            float py = 1;

            if (tiles.size() <= 3) {

            if (tiles.size() <= 3) {