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

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

Merge "Change brightness mirror background" into sc-dev am: 952b75ea 

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

Change-Id: Iaaf5296b9921875655c911f3697158fd15181167
parents 8853e293 952b75ea

packages/SystemUI/res/drawable/brightness_mirror_background.xml

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

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

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

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

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

</shape>

packages/SystemUI/res/layout/brightness_mirror.xml→packages/SystemUI/res/layout/brightness_mirror_container.xml

+8 −4
Original line number Diff line number Diff line
@@ -17,10 +17,14 @@ 
<FrameLayout

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

    android:theme="@style/Theme.SystemUI.QuickSettings"

    android:id="@+id/brightness_mirror"

    android:layout_width="@dimen/qs_panel_width"

    android:layout_height="@dimen/brightness_mirror_height"

    android:layout_gravity="@integer/notification_panel_layout_gravity"

    android:id="@+id/brightness_mirror_container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@drawable/brightness_mirror_background"

    android:layout_gravity="center_vertical"

    android:layout_margin="8dp"

    android:padding="@dimen/rounded_slider_background_padding"

    android:gravity="center"

    android:visibility="invisible">



</FrameLayout>

packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml

+2 −7
Original line number Diff line number Diff line
@@ -13,16 +13,12 @@ 
     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

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

        android:id="@+id/brightness_slider"

        android:layout_width="match_parent"

        android:layout_height="@dimen/brightness_mirror_height"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center"

        android:contentDescription="@string/accessibility_brightness"

        android:importantForAccessibility="no" >
@@ -40,4 +36,3 @@ 
            android:splitTrack="false"

        />

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

packages/SystemUI/res/layout/super_notification_shade.xml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
        android:layout_height="match_parent"

        android:visibility="invisible" />



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

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



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_in_front"

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -1430,6 +1430,9 @@ 
    <dimen name="rounded_slider_track_width">4dp</dimen>

    <!-- rounded_slider_track_width / 2 -->

    <dimen name="rounded_slider_track_corner_radius">2dp</dimen>

    <dimen name="rounded_slider_background_padding">8dp</dimen>

    <!-- rounded_slider_corner_radius + rounded_slider_background_padding -->

    <dimen name="rounded_slider_background_rounded_corner">32dp</dimen>



    <!-- inset for ic_lock_open within a DisabledUdfpsView -->

    <dimen name="udfps_unlock_icon_inset">16dp</dimen>