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

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

Merge "Implement brightness slider spec."

parents 25cb15dc 6adcacc5

packages/SystemUI/res/color/white_disabled.xml

0 → 100644
+20 −0
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.

-->



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

    <item android:color="@android:color/white"

          android:alpha="?android:attr/disabledAlpha" />

</selector>

packages/SystemUI/res/drawable/brightness_mirror_background.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,4 +16,5 @@ 
  -->

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

    <solid android:color="@color/qs_background_dark" />

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

</shape>

packages/SystemUI/res/drawable/brightness_progress_drawable.xml

0 → 100644
+37 −0
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.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@android:id/background"

          android:gravity="center_vertical|fill_horizontal">

        <shape android:shape="rectangle"

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

            <size android:height="@dimen/seek_bar_height" />

            <solid android:color="@color/white_disabled" />

            <corners android:radius="@dimen/seek_bar_corner_radius" />

        </shape>

    </item>

    <item android:id="@android:id/progress"

          android:gravity="center_vertical|fill_horizontal">

        <scale android:scaleWidth="100%">

            <shape android:shape="rectangle"

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

                <size android:height="@dimen/seek_bar_height" />

                <solid android:color="@android:color/white" />

                <corners android:radius="@dimen/seek_bar_corner_radius" />

            </shape>

        </scale>

    </item>

</layer-list>

packages/SystemUI/res/drawable/ic_brightness_thumb.xml

+4 −4
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ Copyright (C) 2017 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="28.0dp"

        android:height="28.0dp"

        android:width="24dp"

        android:height="24dp"

        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="?android:attr/colorPrimary" />

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

    <path

        android:pathData="M20,8.69L20,5c0,-0.55 -0.45,-1 -1,-1h-3.69l-2.6,-2.6a0.996,0.996 0,0 0,-1.41 0L8.69,4L5,4c-0.55,0 -1,0.45 -1,1v3.69l-2.6,2.6a0.996,0.996 0,0 0,0 1.41L4,15.3L4,19c0,0.55 0.45,1 1,1h3.69l2.6,2.6c0.39,0.39 1.02,0.39 1.41,0l2.6,-2.6L19,20c0.55,0 1,-0.45 1,-1v-3.69l2.6,-2.6a0.996,0.996 0,0 0,0 -1.41L20,8.69zM12,18.08c-3.36,0 -6.08,-2.73 -6.08,-6.08S8.64,5.92 12,5.92s6.08,2.73 6.08,6.08 -2.72,6.08 -6.08,6.08zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4z"

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

        android:fillColor="?android:attr/colorControlActivated" />

</vector>

packages/SystemUI/res/layout/brightness_mirror.xml

+7 −7
Original line number Diff line number Diff line
@@ -14,19 +14,19 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

<FrameLayout

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

    android:id="@+id/brightness_mirror"

    android:layout_width="@dimen/qs_panel_width"

    android:layout_height="wrap_content"

    android:layout_height="@dimen/brightness_mirror_height"

    android:layout_gravity="@integer/notification_panel_layout_gravity"

    android:visibility="invisible">

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/brightness_mirror_background"

        android:elevation="2dp">

        <include layout="@layout/quick_settings_brightness_dialog"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

        android:layout_marginLeft="@dimen/notification_side_paddings"

        android:layout_marginRight="@dimen/notification_side_paddings"

        android:background="@drawable/brightness_mirror_background">

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

    </FrameLayout>

</FrameLayout>