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

Commit 90e71530 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge changes I243f1bd9,I977831b2,Ia6b0f35b,Icb3fa967 into main 

* changes:
  Update IME Switcher Menu spacing
  Enable omitting IME Switcher Menu header
  Split IME Switcher menu header and item
  Move IME MenuItem list creation in Menu Controller
parents f9c91987 3d5a59c1

core/res/res/layout/input_method_switch_dialog_new.xml

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
                android:id="@+id/list"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:paddingVertical="8dp"

                android:paddingTop="8dp"

                android:clipToPadding="false"

                android:layoutManager="com.android.internal.widget.LinearLayoutManager"/>
@@ -74,8 +74,7 @@ 
            android:text="@string/input_method_switcher_settings_button"

            android:fontFamily="google-sans-text"

            android:textAppearance="?attr/textAppearance"

            android:contentDescription="@string/input_method_language_settings"

            android:visibility="gone"/>

            android:contentDescription="@string/input_method_language_settings"/>



    </LinearLayout>

core/res/res/layout/input_method_switch_item_divider.xml

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

<!--

  Copyright (C) 2024 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.

-->



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:layout_marginHorizontal="16dp"

    android:layout_marginTop="8dp"

    android:layout_marginBottom="16dp">



    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="?attr/materialColorOutlineVariant"

        android:layout_marginStart="20dp"

        android:layout_marginEnd="24dp"

        android:importantForAccessibility="no"/>



</LinearLayout>

core/res/res/layout/input_method_switch_item_header.xml

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

<!--

  Copyright (C) 2024 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.

-->



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:layout_marginHorizontal="16dp"

    android:layout_marginTop="4dp"

    android:layout_marginBottom="16dp">



    <TextView

        android:id="@+id/header_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginHorizontal="8dp"

        android:ellipsize="end"

        android:singleLine="true"

        android:fontFamily="google-sans-text"

        android:textAppearance="?attr/textAppearance"

        android:accessibilityHeading="true"

        android:textColor="?attr/materialColorPrimary"/>



</LinearLayout>

core/res/res/layout/input_method_switch_item_new.xml

+35 −66
Original line number Diff line number Diff line
@@ -16,43 +16,14 @@ 
-->



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:paddingHorizontal="16dp"

    android:paddingBottom="8dp">



    <View

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="?attr/materialColorSurfaceVariant"

        android:layout_marginStart="20dp"

        android:layout_marginTop="8dp"

        android:layout_marginEnd="24dp"

        android:layout_marginBottom="12dp"

        android:visibility="gone"

        android:importantForAccessibility="no"/>



    <TextView

        android:id="@+id/header_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="8dp"

        android:ellipsize="end"

        android:singleLine="true"

        android:fontFamily="google-sans-text"

        android:textAppearance="?attr/textAppearance"

        android:textColor="?attr/materialColorPrimary"

        android:visibility="gone"/>



    <LinearLayout

    android:id="@+id/list_item"

    android:layout_width="match_parent"

    android:layout_height="72dp"

    android:background="@drawable/input_method_switch_item_background"

    android:gravity="center_vertical"

    android:orientation="horizontal"

    android:layout_marginHorizontal="16dp"

    android:layout_marginBottom="8dp"

    android:paddingStart="20dp"

    android:paddingEnd="24dp">
@@ -87,5 +58,3 @@ 
        android:importantForAccessibility="no"/>



</LinearLayout>
 


</LinearLayout>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,8 @@ 
  <java-symbol type="layout" name="input_method" />

  <java-symbol type="layout" name="input_method_extract_view" />

  <java-symbol type="layout" name="input_method_switch_item" />

  <java-symbol type="layout" name="input_method_switch_item_divider" />

  <java-symbol type="layout" name="input_method_switch_item_header" />

  <java-symbol type="layout" name="input_method_switch_item_new" />

  <java-symbol type="layout" name="input_method_switch_dialog_new" />

  <java-symbol type="layout" name="input_method_switch_dialog_title" />