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

Commit cd542b8a authored by Adrian Roos's avatar Adrian Roos
Browse files

Update brightness slider thumb and spacing 

Also fixes a few errors in the measuring logic.

Bug: 15170399
Change-Id: I7ce7edef0a08dc00ef747988cd64e40a9fbae192
parent 76a1623a

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ 
        <activity

            android:name=".settings.BrightnessDialog"

            android:label="@string/quick_settings_brightness_dialog_title"

            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"

            android:theme="@android:style/Theme.DeviceDefault.Dialog"

            android:finishOnCloseSystemDialogs="true"

            android:launchMode="singleInstance"

            android:excludeFromRecents="true"

packages/SystemUI/res/drawable/ic_brightness_thumb.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<!--

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

-->

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

        android:width="28.0dp"

        android:height="28.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="m18.250000,12.000000a6.250000,6.250000 0.000000,1.000000 1.000000,-12.500000 0.000000,6.250000 6.250000,0.000000 1.000000,1.000000 12.500000,0.000000z"

        android:fillColor="@color/system_primary_color" />

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M20.000000,8.700000L20.000000,4.000000L15.300000,4.000000L12.000000,0.700000 8.700000,4.000000L4.000000,4.000000L4.000000,8.700000L0.700000,12.000000 4.000000,15.300000L4.000000,20.000000L8.700000,20.000000L12.000000,23.299999 15.300000,20.000000L20.000000,20.000000L20.000000,15.300000L23.299999,12.000000 20.000000,8.700000zM12.000000,18.000000C8.700000,18.000000 6.000000,15.300000 6.000000,12.000000 6.000000,8.700000 8.700000,6.000000 12.000000,6.000000c3.300000,0.000000 6.000000,2.700000 6.000000,6.000000 0.000000,3.300000 -2.700000,6.000000 -6.000000,6.000000zM12.000000,8.000000c-2.200000,0.000000 -4.000000,1.800000 -4.000000,4.000000 0.000000,2.200000 1.800000,4.000000 4.000000,4.000000 2.200000,0.000000 4.000000,-1.800000 4.000000,-4.000000 0.000000,-2.200000 -1.800000,-4.000000 -4.000000,-4.000000z"/>

</vector>

packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml

+4 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
-->

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

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

    android:paddingLeft="16dp"

    android:paddingRight="16dp"

    style="@style/BrightnessDialogContainer">



    <ImageView
@@ -24,7 +26,8 @@ 
        android:layout_gravity="center_vertical"

        android:layout_marginEnd="8dp"

        android:src="@drawable/ic_qs_brightness_auto_off"

        android:contentDescription="@null" />

        android:contentDescription="@null"

        android:visibility="gone" />



    <com.android.systemui.settings.ToggleSlider

        android:id="@+id/brightness_slider"

packages/SystemUI/res/layout/status_bar_toggle_slider.xml

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ 
        android:layout_alignParentEnd="true"

        android:paddingStart="20dp"

        android:paddingEnd="20dp"

        android:paddingTop="16dp"

        android:paddingBottom="16dp"

        android:thumb="@drawable/ic_brightness_thumb"

        android:splitTrack="false"

        />

    <TextView

        android:id="@+id/label"

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
    <dimen name="qs_panel_padding_bottom">8dp</dimen>

    <dimen name="qs_detail_item_height">48dp</dimen>

    <dimen name="qs_detail_item_height_twoline">72dp</dimen>

    <dimen name="qs_brightness_padding_top">6dp</dimen>





    <dimen name="segmented_button_spacing">4dp</dimen>