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

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

Merge "Migrate from Plugin SearchTarget to API search Target [1/3]"

parents a9606223 fd58d23c

res/layout/search_result_icon.xml→quickstep/res/layout/search_result_icon.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     limitations under the License.

-->



<com.android.launcher3.views.SearchResultIcon xmlns:launcher="http://schemas.android.com/apk/res-auto"

<com.android.launcher3.search.SearchResultIcon xmlns:launcher="http://schemas.android.com/apk/res-auto"

    style="@style/BaseIcon.AllApps"

    launcher:iconDisplay="all_apps"

    launcher:centerVertically="true" />

res/layout/search_result_icon_row.xml→quickstep/res/layout/search_result_icon_row.xml

+3 −3
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.views.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.launcher3.search.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="@dimen/dynamic_grid_edge_margin">



    <com.android.launcher3.views.SearchResultIcon

    <com.android.launcher3.search.SearchResultIcon

        android:layout_width="wrap_content"

        android:id="@+id/icon"

        launcher:iconDisplay="hero_app"
@@ -73,4 +73,4 @@ 
        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"

        launcher:layoutHorizontal="false" />



</com.android.launcher3.views.SearchResultIconRow>
 
 No newline at end of file
 
</com.android.launcher3.search.SearchResultIconRow>
 
 No newline at end of file

res/layout/search_result_people_item.xml→quickstep/res/layout/search_result_people_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.views.SearchResultPeopleView xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.launcher3.search.SearchResultPeopleView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:gravity="center_vertical"

    android:layout_height="wrap_content"
@@ -60,4 +60,4 @@ 
        android:layout_width="@dimen/deep_shortcut_icon_size"

        android:layout_height="@dimen/deep_shortcut_icon_size" />



</com.android.launcher3.views.SearchResultPeopleView>
 
 No newline at end of file
 
</com.android.launcher3.search.SearchResultPeopleView>
 
 No newline at end of file

res/layout/search_result_play_item.xml→quickstep/res/layout/search_result_play_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.views.SearchResultPlayItem xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.launcher3.search.SearchResultPlayItem xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="4dp"
@@ -76,4 +76,4 @@ 
    </Button>





</com.android.launcher3.views.SearchResultPlayItem>
 
</com.android.launcher3.search.SearchResultPlayItem>

res/layout/search_result_settings_row.xml→quickstep/res/layout/search_result_settings_row.xml

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.views.SearchSettingsRowView xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.launcher3.search.SearchSettingsRowView xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/TextHeadline"

    android:id="@+id/section_title"

    android:background="?android:attr/selectableItemBackground"
@@ -57,4 +57,4 @@ 
            android:textColor="?android:attr/textColorSecondary"

            android:textSize="@dimen/search_hero_subtitle_size" />

    </LinearLayout>

</com.android.launcher3.views.SearchSettingsRowView>
 
 No newline at end of file
 
</com.android.launcher3.search.SearchSettingsRowView>
 
 No newline at end of file