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

Commit 7a2141ef authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Ime in gestural mode will have ime switcher and down arrow" into qt-dev am: 9ad8aa3a 

am: a1432366

Change-Id: Ib447691ca41089e9f884d679da3f92b17c29380b
parents dd0369a5 a1432366

packages/SystemUI/res/layout/contextual.xml

+1 −7
Original line number Diff line number Diff line
@@ -37,16 +37,10 @@ 
        android:paddingStart="@dimen/navigation_key_padding"

        android:paddingEnd="@dimen/navigation_key_padding"

    />

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

        android:id="@+id/ime_switcher"

    <include layout="@layout/ime_switcher"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="0"

        android:scaleType="center"

        android:visibility="invisible"

        android:contentDescription="@string/accessibility_ime_switch_button"

        android:paddingStart="@dimen/navigation_key_padding"

        android:paddingEnd="@dimen/navigation_key_padding"

    />

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

        android:id="@+id/rotate_suggestion"

packages/SystemUI/res/layout/home_handle.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,5 +21,7 @@ 
    android:layout_width="@dimen/navigation_home_handle_width"

    android:layout_height="match_parent"

    android:layout_weight="0"

    android:paddingStart="@dimen/navigation_key_padding"

    android:paddingEnd="@dimen/navigation_key_padding"

    />

packages/SystemUI/res/layout/ime_switcher.xml

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

<!--

  ~ Copyright (C) 2019 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

  -->



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

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

    android:id="@+id/ime_switcher"

    android:layout_width="@dimen/navigation_key_width"

    android:layout_height="match_parent"

    android:layout_weight="0"

    android:contentDescription="@string/accessibility_ime_switch_button"

    android:scaleType="center"

    android:paddingStart="@dimen/navigation_key_padding"

    android:paddingEnd="@dimen/navigation_key_padding"

    />

packages/SystemUI/res/layout/menu_ime.xml

+4 −4
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ 
        android:visibility="invisible"

        android:contentDescription="@string/accessibility_menu"

        />

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

        android:id="@+id/ime_switcher"

    <include layout="@layout/ime_switcher"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="invisible"

        android:contentDescription="@string/accessibility_ime_switch_button"

        android:scaleType="centerInside"

        android:visibility="invisible"

        android:paddingStart="0dp"

        android:paddingEnd="0dp"

        />

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

        android:id="@+id/rotate_suggestion"

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ 
    <!-- Nav bar button default ordering/layout -->

    <string name="config_navBarLayout" translatable="false">left[.5W],back[1WC];home;recent[1WC],right[.5W]</string>

    <string name="config_navBarLayoutQuickstep" translatable="false">back[1.7WC];home;contextual[1.7WC]</string>

    <string name="config_navBarLayoutHandle" translatable="false">";home_handle;"</string>

    <string name="config_navBarLayoutHandle" translatable="false">back[1.7WC];home_handle;ime_switcher[1.7WC]</string>



    <bool name="quick_settings_show_full_alarm">false</bool>