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

Commit 171a0aba authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes for new QS"

parents f070b4ef b5950981

packages/SystemUI/res/drawable/ic_qs_data_disabled.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,8 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

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

        android:width="17dp"

        android:width="17dp"

        android:height="17.0dp"

        android:height="17.0dp"

        android:viewportWidth="20.0"

        android:viewportWidth="24.0"

        android:viewportHeight="20.0">

        android:viewportHeight="24.0">

    <path

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="#FFFFFFFF"

        android:pathData="M19.0,6.41L17.59,5.0 12.0,10.59 6.41,5.0 5.0,6.41 10.59,12.0 5.0,17.59 6.41,19.0 12.0,13.41 17.59,19.0 19.0,17.59 13.41,12.0z"/>

        android:pathData="M19.0,6.41L17.59,5.0 12.0,10.59 6.41,5.0 5.0,6.41 10.59,12.0 5.0,17.59 6.41,19.0 12.0,13.41 17.59,19.0 19.0,17.59 13.41,12.0z"/>

packages/SystemUI/res/drawable/stat_sys_data_disabled.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -14,9 +14,10 @@ 
    limitations under the License.

    limitations under the License.

-->

-->

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

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

        android:width="8.5dp"

        android:autoMirrored="true"

        android:width="17.0dp"

        android:height="17.0dp"

        android:height="17.0dp"

        android:viewportWidth="20.0"

        android:viewportWidth="40.0"

        android:viewportHeight="40.0">

        android:viewportHeight="40.0">

    <path

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="#FFFFFFFF"

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ 
        android:layout_alignParentTop="true"

        android:layout_alignParentTop="true"

        android:focusable="true"

        android:focusable="true"

        android:gravity="center_vertical"

        android:gravity="center_vertical"

        android:paddingEnd="16dp"

        android:paddingStart="16dp"

        android:paddingTop="6dp"

        android:paddingTop="6dp"

        android:singleLine="true"

        android:singleLine="true"

        android:text="@*android:string/emergency_calls_only"

        android:text="@*android:string/emergency_calls_only"

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -3583,7 +3583,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    public void postQSRunnableDismissingKeyguard(final Runnable runnable) {

    public void postQSRunnableDismissingKeyguard(final Runnable runnable) {

        mHandler.post(() -> {

        mHandler.post(() -> {

            mLeaveOpenOnKeyguardHide = true;

            mLeaveOpenOnKeyguardHide = true;

            executeRunnableDismissingKeyguard(runnable, null, false, false, false);

            executeRunnableDismissingKeyguard(() -> mHandler.post(runnable), null, false, false,

                    false);

        });

        });

    }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
        // Set the light/dark theming on the header status UI to match the current theme.

        // Set the light/dark theming on the header status UI to match the current theme.

        SignalClusterView cluster = (SignalClusterView) findViewById(R.id.signal_cluster);

        SignalClusterView cluster = (SignalClusterView) findViewById(R.id.signal_cluster);

        int colorForeground = Utils.getColorAttr(getContext(), android.R.attr.colorForeground);

        int colorForeground = Utils.getColorAttr(getContext(), android.R.attr.colorForeground);

        float intensity = colorForeground / (float) Color.WHITE;

        float intensity = colorForeground == Color.WHITE ? 0 : 1;

        cluster.setIconTint(colorForeground, intensity, new Rect(0, 0, 0, 0));

        cluster.setIconTint(colorForeground, intensity, new Rect(0, 0, 0, 0));

        BatteryMeterView battery = (BatteryMeterView) findViewById(R.id.battery);

        BatteryMeterView battery = (BatteryMeterView) findViewById(R.id.battery);

        int colorSecondary = Utils.getColorAttr(getContext(), android.R.attr.textColorSecondary);

        int colorSecondary = Utils.getColorAttr(getContext(), android.R.attr.textColorSecondary);