Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Coco Duan
2023-03-13 16:02:01 +00:00
committed by Android (Google) Code Review
parent c1ed09a399 fb8fa9238e
commit f7fa5cb414
3 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/SystemUI/res/drawable/dream_overlay_bottom_affordance_bg.xml Normal file
View File

@@ -0,0 +1,28 @@
<?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>

9
packages/SystemUI/res/layout/dream_overlay_home_controls_chip.xml
View File

@@ -22,13 +22,14 @@
<com.android.systemui.animation.view.LaunchableImageView <com.android.systemui.animation.view.LaunchableImageView
android:id="@+id/home_controls_chip" android:id="@+id/home_controls_chip"
android:layout_height="@dimen/keyguard_affordance_fixed_height" android:layout_height="@dimen/dream_overlay_bottom_affordance_height"
android:layout_width="@dimen/keyguard_affordance_fixed_width" android:layout_width="@dimen/dream_overlay_bottom_affordance_width"
android:layout_gravity="bottom|start" 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:tint="?android:attr/textColorPrimary"
android:src="@drawable/controls_icon" android:src="@drawable/controls_icon"
android:background="@drawable/keyguard_bottom_affordance_bg"
android:contentDescription="@string/quick_controls_title" /> android:contentDescription="@string/quick_controls_title" />
</FrameLayout> </FrameLayout>

4
packages/SystemUI/res/values/dimens.xml
View File

@@ -1585,6 +1585,10 @@
<!-- Dream overlay complications related dimensions --> <!-- Dream overlay complications related dimensions -->
<!-- The blur radius applied to the dream overlay when entering and exiting dreams --> <!-- 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_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_text_size">86dp</dimen>
<dimen name="dream_overlay_complication_clock_time_translation_y">28dp</dimen> <dimen name="dream_overlay_complication_clock_time_translation_y">28dp</dimen>
<dimen name="dream_overlay_complication_home_controls_padding">28dp</dimen> <dimen name="dream_overlay_complication_home_controls_padding">28dp</dimen>