PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc fixes on settings search

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

Change-Id: I214b2be3db4fe4c12932763acfb40b6272b43600
Fixes: 72958338
Test: talkback
This commit is contained in:
Fan Zhang
2018-02-06 11:36:07 -08:00
parent 085dcc3783
commit 6013a95b9e
8 changed files with 3 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
res/layout/search_breadcrumb_view.xml
View File

@@ -1,26 +0,0 @@
<?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"/>

23
res/layout/search_feedback.xml
View File

@@ -1,23 +0,0 @@
<?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>

60
res/layout/search_inline_switch_item.xml
View File

@@ -1,60 +0,0 @@
<?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>

54
res/layout/search_intent_item.xml
View File

@@ -1,54 +0,0 @@
<?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>

107
res/layout/search_panel.xml
View File

@@ -1,107 +0,0 @@
<?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>

1
res/layout/settings_main_dashboard.xml
View File

@@ -43,7 +43,6 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentInsetStartWithNavigation="64dp" android:contentInsetStartWithNavigation="64dp"
android:navigationIcon="@drawable/ic_search_24dp" android:navigationIcon="@drawable/ic_search_24dp"
android:navigationContentDescription="@string/search_menu"
android:theme="?android:attr/actionBarTheme"> android:theme="?android:attr/actionBarTheme">
<TextView <TextView
android:id="@+id/search_action_bar_title" android:id="@+id/search_action_bar_title"

7
res/values/strings.xml
View File

@@ -2423,13 +2423,6 @@
<!-- Main Settings screen, setting option name to go into search settings --> <!-- Main Settings screen, setting option name to go into search settings -->
<string name="search_settings">Search</string> <string name="search_settings">Search</string>
<!-- Main Settings screen, setting option summary to go into search settings -->
<string name="search_settings_summary">Manage search settings and history</string>
<!-- There are no search results for the user's search [CHAR LIMIT=NONE]-->
<string name="search_settings_no_results">No results</string>
<!-- Button to clear all search history in Settings [CHAR LIMIT=40]-->
<string name="search_clear_history">Clear history</string>
<!-- Display settings --><skip/> <!-- Display settings --><skip/>
<!-- Sound & display settings screen, section header for settings related to display --> <!-- Sound & display settings screen, section header for settings related to display -->

3
src/com/android/settings/SettingsActivity.java
View File

@@ -16,6 +16,8 @@
package com.android.settings; package com.android.settings;
import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.Fragment; import android.app.Fragment;
@@ -329,6 +331,7 @@ public class SettingsActivity extends SettingsDrawerActivity
// and goes to the search UI. Also set the background to null so there's no ripple. // and goes to the search UI. Also set the background to null so there's no ripple.
View navView = toolbar.getNavigationView(); View navView = toolbar.getNavigationView();
navView.setClickable(false); navView.setClickable(false);
navView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
navView.setBackground(null); navView.setBackground(null);
} }