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

Commit 9182d4ac authored by Coco Duan's avatar Coco Duan Committed by Automerger Merge Worker
Browse files

Merge "[Overlay] Adjust Home Controls button size" into tm-qpr-dev am:... 

Merge "[Overlay] Adjust Home Controls button size" into tm-qpr-dev am: f7fa5cb4 am: 1169a57b am: 0eda9e92 am: 8fea7069

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



Change-Id: I734668b6f34940b85d99180bf5ecc3c458fafe6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89c79ce1 8fea7069

packages/SystemUI/res/drawable/dream_overlay_bottom_affordance_bg.xml

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

<!--

/*

* Copyright 2023, 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"

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

    android:shape="rectangle">

  <solid android:color="?androidprv:attr/colorSurface"/>

  <size

      android:width="@dimen/dream_overlay_bottom_affordance_height"

      android:height="@dimen/dream_overlay_bottom_affordance_width"/>

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

</shape>

packages/SystemUI/res/layout/dream_overlay_home_controls_chip.xml

+5 −4
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ 


    <com.android.systemui.animation.view.LaunchableImageView

        android:id="@+id/home_controls_chip"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

        android:layout_width="@dimen/keyguard_affordance_fixed_width"

        android:layout_height="@dimen/dream_overlay_bottom_affordance_height"

        android:layout_width="@dimen/dream_overlay_bottom_affordance_width"

        android:layout_gravity="bottom|start"

        android:scaleType="center"

        android:padding="@dimen/dream_overlay_bottom_affordance_padding"

        android:background="@drawable/dream_overlay_bottom_affordance_bg"

        android:scaleType="fitCenter"

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

        android:src="@drawable/controls_icon"

        android:background="@drawable/keyguard_bottom_affordance_bg"

        android:contentDescription="@string/quick_controls_title" />



</FrameLayout>

packages/SystemUI/res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -1630,6 +1630,10 @@ 
    <!-- Dream overlay complications related dimensions -->

    <!-- The blur radius applied to the dream overlay when entering and exiting dreams -->

    <dimen name="dream_overlay_anim_blur_radius">50dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_height">64dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_width">64dp</dimen>

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

    <dimen name="dream_overlay_bottom_affordance_padding">14dp</dimen>

    <dimen name="dream_overlay_complication_clock_time_text_size">86dp</dimen>

    <dimen name="dream_overlay_complication_clock_time_translation_y">28dp</dimen>

    <dimen name="dream_overlay_complication_home_controls_padding">28dp</dimen>