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

Commit 01800449 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Add saved Search queries feature"

parents 6d26d10f d297a584

res/layout/search_panel.xml

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

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

-->



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

        android:id="@+id/dashboard"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



    <LinearLayout android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:orientation="vertical">



        <LinearLayout android:id="@+id/layout_suggestions"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:orientation="vertical">



            <TextView android:layout_width="wrap_content"

                      android:layout_height="wrap_content"

                      android:singleLine="true"

                      android:ellipsize="marquee"

                      android:fadingEdge="horizontal"

                      android:textAppearance="?android:attr/textAppearanceMedium"

                      android:text="@string/search_recents_queries_label"/>



            <ListView android:id="@+id/list_suggestions"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent" />



            <ImageView android:src="?android:attr/dividerHorizontal"

                       android:layout_width="fill_parent"

                       android:layout_height="wrap_content"

                       android:scaleType="fitXY"

                       android:paddingBottom="2dp"

                       android:paddingTop="2dp" />



        </LinearLayout>



        <LinearLayout android:id="@+id/layout_results"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="center"

                android:orientation="vertical"

                android:layout_weight="1" >



            <TextView android:layout_width="wrap_content"

                      android:layout_height="wrap_content"

                      android:singleLine="true"

                      android:ellipsize="marquee"

                      android:fadingEdge="horizontal"

                      android:textAppearance="?android:attr/textAppearanceMedium"

                      android:text="@string/search_results_label"/>



            <ListView android:id="@+id/list_results"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    />



        </LinearLayout>



    </LinearLayout>



</FrameLayout>

res/layout/search_results.xml

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

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

-->



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

    android:id="@+id/dashboard"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <LinearLayout android:layout_width="match_parent"

                  android:layout_height="match_parent"

                  android:layout_gravity="center"

                  android:orientation="vertical">



        <ListView android:id="@+id/list_results"

                      android:layout_width="match_parent"

                      android:layout_height="match_parent"/>



    </LinearLayout>



</FrameLayout>

res/layout/search_suggestion_item.xml

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

<!-- Copyright (C) 2014 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:minHeight="?android:attr/listPreferredItemHeight"

              android:gravity="center_vertical"

              android:paddingStart="@*android:dimen/preference_item_padding_side"

              android:paddingEnd="?android:attr/scrollbarSize">



    <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:gravity="center"

            android:minWidth="@*android:dimen/preference_icon_minWidth"

            android:orientation="horizontal">



        <ImageView

                android:id="@+id/icon"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_gravity="center"

                android:minWidth="48dp"

                android:scaleType="centerInside"

                android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"

                />



    </LinearLayout>



    <RelativeLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:paddingEnd="@*android:dimen/preference_item_padding_inner"

            android:paddingTop="6dip"

            android:paddingBottom="6dip">



        <TextView android:id="@+id/title"

                  android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

                  android:singleLine="true"

                  android:textAppearance="?android:attr/textAppearanceMedium"

                  android:ellipsize="marquee"

                  android:fadingEdge="horizontal" />



    </RelativeLayout>



</LinearLayout>

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -5024,6 +5024,11 @@ 
    <!-- Text used as a search hint into the search box -->

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



    <!-- Text used to identify the search query suggestions / recent searches -->

    <string name="search_recents_queries_label">Recent searches</string>

    <!-- Text used to identify the search results -->

    <string name="search_results_label">Results</string>



    <!--Search Keywords-->

    <string name="keywords_wifi">wifi wi-fi network connection</string>

src/com/android/settings/SettingsActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -1280,6 +1280,7 @@ public class SettingsActivity extends Activity 
            mSearchResultsFragment = (SearchResultsSummary) switchToFragment(

                    SearchResultsSummary.class.getName(), null, false, true, title, true);

        }

        mSearchResultsFragment.setSearchView(mSearchView);

        mSearchMenuItemExpanded = true;

    }