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

Commit c4eb1da3 authored by Pranav Vashi's avatar Pranav Vashi
Browse files

SystemUI: Use brightness icon matching with slider redesign 

* Extracted from https://github.com/crdroidandroid/android_frameworks_base/commit/91bd04a453eae0770663465c75ca238a86c63367



* Updated for A15.

Change-Id: Ica5b931f65945430130ca92d1efa5cf37774b525
Signed-off-by: default avatarPranav Vashi <neobuddy89@gmail.com>
parent f7a4ea59

packages/SystemUI/res/drawable/brightness_bg.xml

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

<!--

  ~ Copyright (C) 2021 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">

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

    <solid android:color="?android:attr/colorAccent" />

    <size android:width="48dp" android:height="48dp" />

</shape>

packages/SystemUI/res/drawable/ic_qs_brightness_auto_off.xml

+5 −5
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
    limitations under the License.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:width="36.0dip"

        android:height="48.0dip"

        android:viewportWidth="36.0"

        android:viewportHeight="48.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M20,8.69L20,4h-4.69L12,0.69 8.69,4L4,4v4.69L0.69,12 4,15.31L4,20h4.69L12,23.31 15.31,20L20,20v-4.69L23.31,12 20,8.69zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4z"/>

        android:pathData="M 26,20.69 V 16 H 21.31 L 18,12.69 14.69,16 H 10 v 4.69 L 6.69,24 10,27.31 V 32 h 4.69 L 18,35.31 21.31,32 H 26 V 27.31 L 29.31,24 Z m -2,5.79 V 30 H 20.48 L 18,32.48 15.52,30 H 12 V 26.48 L 9.52,24 12,21.52 V 18 h 3.52 L 18,15.52 20.48,18 H 24 v 3.52 L 26.48,24 Z M 18,18 v 12 c 3.31,0 6,-2.69 6,-6 0,-3.31 -2.69,-6 -6,-6 z"/>

</vector>

packages/SystemUI/res/drawable/ic_qs_brightness_auto_on.xml

+5 −5
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
    limitations under the License.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:width="36.0dip"

        android:height="48.0dip"

        android:viewportWidth="36.0"

        android:viewportHeight="48.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M10.85,12.65h2.3L12,9l-1.15,3.65zM20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69L23.31,12 20,8.69zM14.3,16l-0.7,-2h-3.2l-0.7,2H7.8L11,7h2l3.2,9h-1.9z"/>

        android:pathData="m 17,19 -3.2,9 h 1.9 l 0.7,-2 h 3.2 l 0.7,2 h 1.9 L 19,19 Z M 16.85,24.65 18,21 19.15,24.65 Z M 26,20.69 V 16 H 21.31 L 18,12.69 14.69,16 H 10 v 4.69 L 6.69,24 10,27.31 V 32 h 4.69 L 18,35.31 21.31,32 H 26 V 27.31 L 29.31,24 Z m -2,5.79 V 30 H 20.48 L 18,32.48 15.52,30 H 12 V 26.48 L 9.52,24 12,21.52 V 18 h 3.52 L 18,15.52 20.48,18 H 24 v 3.52 L 26.48,24 Z"/>

</vector>

packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml

+6 −4
Original line number Diff line number Diff line
@@ -18,10 +18,11 @@ 
        android:id="@+id/brightness_slider"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:contentDescription="@string/accessibility_brightness"

        android:orientation="horizontal"

        android:importantForAccessibility="no" >



        <com.android.systemui.settings.brightness.ToggleSeekBar
@@ -38,14 +39,15 @@ 
            android:splitTrack="false"

        />



        <ImageView

        <ImageButton

            android:id="@+id/brightness_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:layout_marginStart="4dp"

            android:layout_marginEnd="8dp"

            android:layout_marginStart="20.0dip"

            android:background="@drawable/brightness_bg"

            android:src="@drawable/ic_qs_brightness_auto_off"

            android:tint="?android:attr/textColorPrimaryInverse"

            android:contentDescription="@null"

            android:visibility="gone"

        />