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

Commit efbfcb83 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Sanitizing various search container ids and layout names" into ub-launcher3-dorval-polish

parents f593fb91 c7b8df83
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@
        <!-- DO NOT CHANGE THE ID -->
        <com.android.launcher3.allapps.AllAppsRecyclerView
            android:id="@+id/apps_list_view"
            android:layout_below="@+id/search_container"
            android:layout_below="@id/search_container_all_apps"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_gravity="center_horizontal|top"
@@ -62,7 +62,7 @@
         platform bug, which prevents using custom attributes in <include> tag -->
        <include
            layout="?android:attr/keyboardLayout"
            android:id="@+id/search_container" />
            android:id="@id/search_container_all_apps" />

        <include layout="@layout/all_apps_fast_scroller" />

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
-->
<com.android.launcher3.allapps.search.AppsSearchContainerLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/search_container"
    android:id="@id/search_container_all_apps"
    android:layout_width="match_parent"
    android:layout_height="@dimen/all_apps_search_bar_height"
    android:layout_gravity="center|top"
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
        android:orientation="vertical"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:id="@+id/qsb_container"
        android:id="@id/search_container_workspace"
        android:padding="0dp" >

    <fragment
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
        <item name="android:windowNoTitle">true</item>
        <item name="android:windowActionModeOverlay">true</item>
        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
        <item name="android:keyboardLayout">@layout/all_apps_search_container</item>
        <item name="android:keyboardLayout">@layout/search_container_all_apps</item>
    </style>

    <!-- Workspace -->
+6 −0
Original line number Diff line number Diff line
@@ -140,4 +140,10 @@
    <item type="id" name="action_resize" />
    <item type="id" name="action_deep_shortcuts" />
    <item type="id" name="action_dismiss_notification" />

<!-- QSB IDs. DO not change -->
    <item type="id" name="search_container_workspace" />
    <item type="id" name="search_container_hotseat" />
    <item type="id" name="search_container_all_apps" />

</resources>
Loading