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

Commit 6013a95b authored by Fan Zhang's avatar Fan Zhang
Browse files

Misc fixes on settings search 

- Remove some unused resources
- Disable contentDescription on search icon in homepage

Change-Id: I214b2be3db4fe4c12932763acfb40b6272b43600
Fixes: 72958338
Test: talkback
parent 085dcc37

res/layout/search_breadcrumb_view.xml

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

<!--

  Copyright (C) 2017 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:id="@+id/breadcrumb"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingTop="5dp"

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

    android:textColor="?android:attr/textColorSecondary"

    android:ellipsize="marquee"/>

res/layout/search_feedback.xml

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

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

-->



<View

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

    android:id="@+id/feedback_popup"

    android:layout_width="0dp"

    android:layout_height="0dp"

    android:visibility="gone">

</View>

res/layout/search_inline_switch_item.xml

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

-->



<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:paddingTop="16dp"

    android:paddingBottom="16dp"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">



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



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical">



        <TextView

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

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

            android:ellipsize="marquee"/>



        <TextView

            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"/>



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

    </LinearLayout>



    <Switch

        android:id="@+id/switchView"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="top"

        android:paddingStart="16dp"/>

</LinearLayout>

res/layout/search_intent_item.xml

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

-->



<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:paddingTop="16dp"

    android:paddingBottom="16dp"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">



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



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical">



        <TextView

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

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

            android:ellipsize="marquee"/>



        <TextView

            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

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

            android:ellipsize="marquee"/>



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

    </LinearLayout>

</LinearLayout>

res/layout/search_panel.xml

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

-->

<LinearLayout

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

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

    android:id="@+id/search_panel"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <FrameLayout

        android:id="@+id/search_bar_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/suggestion_condition_background">

        <android.support.v7.widget.CardView

            android:id="@+id/search_bar"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/search_bar_margin"

            app:cardCornerRadius="2dp"

            app:cardBackgroundColor="?android:attr/colorBackground"

            app:cardElevation="2dp">

            <Toolbar

                android:id="@+id/search_toolbar"

                android:layout_width="match_parent"

                android:layout_height="@dimen/search_bar_height"

                android:background="?android:attr/selectableItemBackground"

                android:contentInsetStart="0dp"

                android:contentInsetStartWithNavigation="0dp"

                android:theme="?android:attr/actionBarTheme">

                <SearchView

                    android:id="@+id/search_view"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:iconifiedByDefault="false"

                    android:imeOptions="actionSearch|flagNoExtractUi"

                    android:searchIcon="@null"/>

            </Toolbar>

        </android.support.v7.widget.CardView>

    </FrameLayout>



    <FrameLayout

        android:id="@+id/layout_results"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:orientation="vertical">



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

        <android.support.v7.widget.RecyclerView

            android:id="@+id/list_results"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            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:scrollbars="vertical"/>



        <LinearLayout

            android:id="@+id/no_results_layout"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingTop="35dp"

            android:orientation="vertical"

            android:visibility="gone">



            <Space

                android:layout_width="match_parent"

                android:layout_height="?android:attr/actionBarSize"/>



            <ImageView

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center_horizontal"

                android:src="@drawable/empty_search_results"/>



            <TextView

                android:layout_height="wrap_content"

                android:layout_width="match_parent"

                android:paddingTop="24dp"

                android:textSize="18sp"

                android:text="@string/search_settings_no_results"

                android:gravity="center"/>



        </LinearLayout>



    </FrameLayout>



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



</LinearLayout>