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

Merge "Use ImageButtons instead of Buttons in handle menu" into tm-qpr-dev

Browse Source
This commit is contained in:
Jorge Gil
2023-03-01 19:37:19 +00:00
committed by Android (Google) Code Review
parent ecab1860d8 3f89c4ac97
commit 5df29339ac
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/WindowManager/Shell/res/layout/desktop_mode_decor_handle_menu.xml
View File

@@ -63,38 +63,46 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_weight="0.5" /> android:layout_weight="0.5" />
<Button <ImageButton
style="@style/CaptionWindowingButtonStyle" style="@style/CaptionWindowingButtonStyle"
android:id="@+id/fullscreen_button" android:id="@+id/fullscreen_button"
android:contentDescription="@string/fullscreen_text" android:contentDescription="@string/fullscreen_text"
android:background="@drawable/caption_fullscreen_button"/> android:src="@drawable/caption_fullscreen_button"
android:scaleType="fitCenter"
android:background="?android:selectableItemBackgroundBorderless"/>
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_weight="1" /> android:layout_weight="1" />
<Button <ImageButton
style="@style/CaptionWindowingButtonStyle" style="@style/CaptionWindowingButtonStyle"
android:id="@+id/split_screen_button" android:id="@+id/split_screen_button"
android:contentDescription="@string/split_screen_text" android:contentDescription="@string/split_screen_text"
android:background="@drawable/caption_split_screen_button"/> android:src="@drawable/caption_split_screen_button"
android:scaleType="fitCenter"
android:background="?android:selectableItemBackgroundBorderless"/>
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_weight="1" /> android:layout_weight="1" />
<Button <ImageButton
style="@style/CaptionWindowingButtonStyle" style="@style/CaptionWindowingButtonStyle"
android:id="@+id/floating_button" android:id="@+id/floating_button"
android:contentDescription="@string/float_button_text" android:contentDescription="@string/float_button_text"
android:background="@drawable/caption_floating_button"/> android:src="@drawable/caption_floating_button"
android:scaleType="fitCenter"
android:background="?android:selectableItemBackgroundBorderless"/>
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_weight="1" /> android:layout_weight="1" />
<Button <ImageButton
style="@style/CaptionWindowingButtonStyle" style="@style/CaptionWindowingButtonStyle"
android:id="@+id/desktop_button" android:id="@+id/desktop_button"
android:contentDescription="@string/desktop_text" android:contentDescription="@string/desktop_text"
android:background="@drawable/caption_desktop_button"/> android:src="@drawable/caption_desktop_button"
android:scaleType="fitCenter"
android:background="?android:selectableItemBackgroundBorderless"/>
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"

6
libs/WindowManager/Shell/res/values/styles.xml
View File

@@ -38,11 +38,9 @@
</style> </style>
<style name="CaptionWindowingButtonStyle"> <style name="CaptionWindowingButtonStyle">
<item name="android:layout_width">32dp</item> <item name="android:layout_width">40dp</item>
<item name="android:layout_height">32dp</item> <item name="android:layout_height">40dp</item>
<item name="android:padding">4dp</item> <item name="android:padding">4dp</item>
<item name="android:layout_marginTop">5dp</item>
<item name="android:layout_marginBottom">5dp</item>
</style> </style>
<style name="CaptionMenuButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless"> <style name="CaptionMenuButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">