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

Commit 6acbc933 authored by Fan Zhang's avatar Fan Zhang
Browse files

Move search resources to settingslib-search 

Bug: 113128828
Test: manual
Change-Id: I2c513dd22e84d5f86bd282e10d0b0df19f9ce407
parent cc9ffafb

res/drawable/ic_search_24dp.xml

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

<!--

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

  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M20.49,19l-5.73,-5.73C15.53,12.2 16,10.91 16,9.5C16,5.91 13.09,3 9.5,3S3,5.91 3,9.5C3,13.09 5.91,16 9.5,16c1.41,0 2.7,-0.47 3.77,-1.24L19,20.49L20.49,19zM5,9.5C5,7.01 7.01,5 9.5,5S14,7.01 14,9.5S11.99,14 9.5,14S5,11.99 5,9.5z"/>

</vector>

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -6903,8 +6903,6 @@ 
    <!-- Search strings -->

    <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->

    <string name="search_results_title">Settings</string>

    <!-- Text used as a search hint into the search box -->

    <string name="search_menu">Search settings</string>

    <!-- Search breadcrumb connector symbol -->

    <string name="search_breadcrumb_connector" translatable="false">

        <xliff:g name="first_item">%1$s</xliff:g> > <xliff:g name="second_item">%2$s</xliff:g>

src/com/android/settings/search/SearchFeatureProvider.java

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public interface SearchFeatureProvider { 
        return "com.android.settings.intelligence";

    }





    /**

     * Initializes the search toolbar.

     */

tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { 
                    Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/HelpUtils/res/")), null));

            paths.add(new ResourcePath(null,

                    Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/RestrictedLockUtils/res/")), null));

            paths.add(new ResourcePath(null,

                    Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SearchWidget/res/")), null));

            paths.add(new ResourcePath(null,

                Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null));

            paths.add(new ResourcePath(null,