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

Commit e506df2a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove brightness slider flag" into sc-dev am: 0980b0a0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14094245

Change-Id: Id2700e02db37f53541e03b2b5f032289e0fadfd8
parents 1ade72e1 0980b0a0

packages/SystemUI/res/drawable/brightness_progress_drawable.xml

+31 −31
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.

<!--

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

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

            android:paddingMode="stack" >

    <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" />

        <inset

            android:insetLeft="@dimen/rounded_slider_track_inset"

            android:insetRight="@dimen/rounded_slider_track_inset" >

            <shape>

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

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

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

            </shape>

        </inset>

    </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>

            <com.android.systemui.util.RoundedCornerProgressDrawable

                android:drawable="@drawable/brightness_progress_full_drawable"

            />

    </item>

</layer-list>
 
 No newline at end of file

packages/SystemUI/res/drawable/brightness_progress_drawable_thick.xml

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

<!--

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

            android:paddingMode="stack" >

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

        android:gravity="center_vertical|fill_horizontal">

        <inset

            android:insetLeft="@dimen/rounded_slider_track_inset"

            android:insetRight="@dimen/rounded_slider_track_inset" >

            <shape>

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

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

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

            </shape>

        </inset>

    </item>

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

          android:gravity="center_vertical|fill_horizontal">

            <com.android.systemui.util.RoundedCornerProgressDrawable

                android:drawable="@drawable/brightness_progress_full_drawable"

            />

    </item>

</layer-list>
 
 No newline at end of file

packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml

+13 −51
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project

<!-- Copyright (C) 2020 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.
@@ -13,69 +13,31 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

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

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:layout_gravity="center_vertical"

    style="@style/BrightnessDialogContainer">

    android:layout_gravity="center">



    <com.android.systemui.settings.brightness.BrightnessSliderView

        android:id="@+id/brightness_slider"

        android:layout_width="0dp"

        android:layout_width="match_parent"

        android:layout_height="@dimen/brightness_mirror_height"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:contentDescription="@string/accessibility_brightness"

        android:importantForAccessibility="no"

        systemui:text="@string/status_bar_settings_auto_brightness_label" >



        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent" >

        android:importantForAccessibility="no" >



        <CheckBox

            android:id="@+id/toggle"

            android:layout_width="48dp"

            android:layout_height="0dp"

            android:layout_alignParentStart="true"

            android:layout_alignParentTop="true"

            android:layout_alignParentBottom="true"

            android:button="@null"

            android:background="@*android:drawable/switch_track_material"

            android:visibility="gone"

        />

        <com.android.systemui.settings.brightness.ToggleSeekBar

            android:id="@+id/slider"

            android:layout_width="0dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_toEndOf="@id/toggle"

            android:layout_centerVertical="true"

            android:layout_alignParentStart="true"

            android:layout_alignParentEnd="true"

            android:paddingStart="20dp"

            android:paddingEnd="20dp"

            android:paddingTop="16dp"

            android:paddingBottom="16dp"

            android:thumb="@drawable/ic_brightness_thumb"

            android:layout_gravity="center_vertical"

            android:minHeight="48dp"

            android:thumb="@null"

            android:background="@null"

            android:paddingStart="0dp"

            android:paddingEnd="0dp"

            android:progressDrawable="@drawable/brightness_progress_drawable"

            android:splitTrack="false"

        />

        <TextView

            android:id="@+id/label"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_alignStart="@id/toggle"

            android:layout_alignEnd="@id/toggle"

            android:layout_centerVertical="true"

            android:gravity="center"

            android:paddingTop="26dp"

            android:textColor="#666666"

            android:textSize="12sp"

            android:visibility="gone"

        />



        </RelativeLayout>

    </com.android.systemui.settings.brightness.BrightnessSliderView>



</LinearLayout>
 
</FrameLayout>

packages/SystemUI/res/layout/quick_settings_brightness_dialog_thick.xml

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

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

-->

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

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:layout_gravity="center">



    <com.android.systemui.settings.brightness.BrightnessSliderView

        android:id="@+id/brightness_slider"

        android:layout_width="match_parent"

        android:layout_height="@dimen/brightness_mirror_height"

        android:layout_gravity="center_vertical"

        android:contentDescription="@string/accessibility_brightness"

        android:importantForAccessibility="no" >



        <com.android.systemui.settings.brightness.ToggleSeekBar

            android:id="@+id/slider"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:minHeight="48dp"

            android:thumb="@null"

            android:background="@null"

            android:paddingStart="0dp"

            android:paddingEnd="0dp"

            android:progressDrawable="@drawable/brightness_progress_drawable_thick"

            android:splitTrack="false"

        />

    </com.android.systemui.settings.brightness.BrightnessSliderView>

</FrameLayout>

packages/SystemUI/res/values-h740dp-port/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
    <dimen name="qs_tile_margin_vertical">24dp</dimen>



    <!-- The height of the qs customize header. Should be

         (qs_panel_padding_top (48dp) +  brightness_mirror_height (56dp) + qs_tile_margin_top (18dp)) -

         (qs_panel_padding_top (48dp) +  brightness_mirror_height (48dp) + qs_tile_margin_top (18dp)) -

         (Toolbar_minWidth (56dp) + qs_tile_margin_top_bottom (12dp))

    -->

    <dimen name="qs_customize_header_min_height">54dp</dimen>

    <dimen name="qs_customize_header_min_height">46dp</dimen>

    <dimen name="qs_tile_margin_top">18dp</dimen>

</resources>
 
 No newline at end of file