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

Commit 0b431fc0 authored by Matthew Fritze's avatar Matthew Fritze
Browse files

Purify SettingsActivity from old search code. 

Bug:35763944, 32590887
Test: make RunSettingsRoboTests
Change-Id: Id8140b68a676e595bff095546fa119cd3ced2c4a
parent 8973e278

res/layout/search_panel.xml

deleted100644 → 0
+0 −74
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/search_panel"

        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">



            <!-- Padding is included in the background -->

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

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:paddingStart="@dimen/dashboard_padding_start"

                    android:paddingEnd="@dimen/dashboard_padding_end"

                    android:paddingTop="@dimen/dashboard_padding_top"

                    android:paddingBottom="@dimen/dashboard_padding_bottom"

                    android:scrollbarStyle="outsideOverlay"

                    android:headerDividersEnabled="false"

                    android:background="@drawable/search_panel_list_background"

                    android:elevation="@dimen/search_panel_elevation"

                    />



        </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">



            <!-- Padding is included in the background -->

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

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:paddingStart="@dimen/dashboard_padding_start"

                    android:paddingEnd="@dimen/dashboard_padding_end"

                    android:paddingTop="@dimen/dashboard_padding_top"

                    android:paddingBottom="@dimen/dashboard_padding_bottom"

                    android:scrollbarStyle="outsideOverlay"

                    android:headerDividersEnabled="false"

                    android:background="@drawable/search_panel_list_background"

                    android:elevation="@dimen/search_panel_elevation"

                    />



        </LinearLayout>



    </LinearLayout>



</FrameLayout>

res/layout/search_panel_results_header.xml

deleted100644 → 0
+0 −27
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.

-->



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

          android:layout_width="match_parent"

          android:layout_height="@dimen/dashboard_category_height"

          android:paddingStart="@dimen/search_title_padding_start"

          android:singleLine="true"

          android:ellipsize="marquee"

          android:gravity="center_vertical"

          android:textAppearance="@style/TextAppearance.ResultTitle"

          android:textAlignment="viewStart"

          android:text="@string/search_results_label"

        />

res/layout/search_panel_suggestions_header.xml

deleted100644 → 0
+0 −27
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.

-->



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

          android:layout_width="match_parent"

          android:layout_height="@dimen/dashboard_category_height"

          android:paddingStart="@dimen/search_title_padding_start"

          android:singleLine="true"

          android:ellipsize="marquee"

          android:gravity="center_vertical"

          android:textAppearance="@style/TextAppearance.RecentsTitle"

          android:textAlignment="viewStart"

          android:text="@string/search_recents_queries_label"

        />

res/layout/search_result_item.xml

deleted100644 → 0
+0 −57
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: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="@dimen/search_result_item_image_size"

                android:layout_height="@dimen/search_result_item_image_size"

                android:scaleType="centerInside"

                android:layout_marginStart="@dimen/search_result_item_image_margin_start"

                android:layout_marginEnd="@dimen/search_result_item_image_margin_end"

                />



    </LinearLayout>



    <RelativeLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1">



        <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/menu/options_menu.xml

deleted100644 → 0
+0 −24
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.

-->



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

    <item

        android:id="@+id/search"

        android:title="@string/search_menu"

        android:icon="@*android:drawable/ic_search_api_material"

        android:showAsAction="collapseActionView|ifRoom"

        android:actionViewClass="android.widget.SearchView" />

</menu>
 
 No newline at end of file