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

Commit 5df29339 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

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

parents ecab1860 3f89c4ac

libs/WindowManager/Shell/res/layout/desktop_mode_decor_handle_menu.xml

+16 −8
Original line number Diff line number Diff line
@@ -63,38 +63,46 @@ 
            android:layout_width="0dp"

            android:layout_height="1dp"

            android:layout_weight="0.5" />

        <Button

        <ImageButton

            style="@style/CaptionWindowingButtonStyle"

            android:id="@+id/fullscreen_button"

            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

            android:layout_width="0dp"

            android:layout_height="1dp"

            android:layout_weight="1" />

        <Button

        <ImageButton

            style="@style/CaptionWindowingButtonStyle"

            android:id="@+id/split_screen_button"

            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

            android:layout_width="0dp"

            android:layout_height="1dp"

            android:layout_weight="1" />

        <Button

        <ImageButton

            style="@style/CaptionWindowingButtonStyle"

            android:id="@+id/floating_button"

            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

            android:layout_width="0dp"

            android:layout_height="1dp"

            android:layout_weight="1" />

        <Button

        <ImageButton

            style="@style/CaptionWindowingButtonStyle"

            android:id="@+id/desktop_button"

            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

            android:layout_width="0dp"

            android:layout_height="1dp"

libs/WindowManager/Shell/res/values/styles.xml

+2 −4
Original line number Diff line number Diff line
@@ -38,11 +38,9 @@ 
    </style>



    <style name="CaptionWindowingButtonStyle">

        <item name="android:layout_width">32dp</item>

        <item name="android:layout_height">32dp</item>

        <item name="android:layout_width">40dp</item>

        <item name="android:layout_height">40dp</item>

        <item name="android:padding">4dp</item>

        <item name="android:layout_marginTop">5dp</item>

        <item name="android:layout_marginBottom">5dp</item>

    </style>



    <style name="CaptionMenuButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">