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

Commit 8e4419a0 authored by Mike Digman's avatar Mike Digman Committed by Android (Google) Code Review
Browse files

Merge "Prevent recent and right navbar icon overlap"

parents 1bd402b8 30cb07a8

packages/SystemUI/res/layout/menu_ime.xml

+9 −10
Original line number Original line Diff line number Diff line
@@ -16,15 +16,17 @@ 




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

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

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

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

    android:layout_width="@dimen/navigation_side_padding"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:layout_weight="0"

    >

    >

    <!-- Use width & height=match_parent for parent FrameLayout and buttons because they are placed

    inside a view that has a size controlled by weight. Ensure weight is large enough to support

    icon size. -->



    <com.android.systemui.statusbar.policy.KeyButtonView

    <com.android.systemui.statusbar.policy.KeyButtonView

        android:id="@+id/menu"

        android:id="@+id/menu"

        android:layout_width="@dimen/navigation_extra_key_width"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:layout_marginEnd="2dp"

        android:scaleType="centerInside"

        android:scaleType="centerInside"

        systemui:keyCode="82"

        systemui:keyCode="82"

        systemui:playSound="false"

        systemui:playSound="false"
@@ -33,27 +35,24 @@ 
        />

        />

    <com.android.systemui.statusbar.policy.KeyButtonView

    <com.android.systemui.statusbar.policy.KeyButtonView

        android:id="@+id/ime_switcher"

        android:id="@+id/ime_switcher"

        android:layout_width="@dimen/navigation_extra_key_width"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:layout_marginEnd="2dp"

        android:visibility="invisible"

        android:visibility="invisible"

        android:contentDescription="@string/accessibility_ime_switch_button"

        android:contentDescription="@string/accessibility_ime_switch_button"

        android:scaleType="centerInside"

        android:scaleType="centerInside"

        />

        />

    <com.android.systemui.statusbar.policy.KeyButtonView

    <com.android.systemui.statusbar.policy.KeyButtonView

        android:id="@+id/rotate_suggestion"

        android:id="@+id/rotate_suggestion"

        android:layout_width="@dimen/navigation_extra_key_width"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:layout_marginEnd="2dp"

        android:visibility="invisible"

        android:visibility="invisible"

        android:scaleType="centerInside"

        android:scaleType="centerInside"

        android:contentDescription="@string/accessibility_rotate_button"

        android:contentDescription="@string/accessibility_rotate_button"

        />

        />

    <com.android.systemui.statusbar.policy.KeyButtonView

    <com.android.systemui.statusbar.policy.KeyButtonView

        android:id="@+id/accessibility_button"

        android:id="@+id/accessibility_button"

        android:layout_width="@dimen/navigation_extra_key_width"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:layout_marginEnd="2dp"

        android:visibility="invisible"

        android:visibility="invisible"

        android:contentDescription="@string/accessibility_accessibility_button"

        android:contentDescription="@string/accessibility_accessibility_button"

        android:scaleType="centerInside"

        android:scaleType="centerInside"