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

Merge "Search bar polish" into oc-dr1-dev am: d10a1af258

Browse Source 
am: e0c01c6605

Change-Id: I39bae9af6032e392bfcb96eaab1af281bc705273
This commit is contained in:
Andrew Sapperstein
2017-07-07 18:04:37 +00:00
committed by android-build-merger
parent 0f9d39518b e0c01c6605
commit 1bc4a459fb
6 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/search_panel.xml
View File

@@ -36,7 +36,7 @@
<Toolbar
android:id="@+id/search_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/search_bar_height"
android:background="?android:attr/selectableItemBackground"
android:contentInsetStart="0dp"
android:contentInsetStartWithNavigation="0dp"

5
res/layout/settings_main_dashboard.xml
View File

@@ -37,11 +37,12 @@
<Toolbar
android:id="@+id/search_action_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/search_bar_height"
android:background="?android:attr/selectableItemBackground"
android:contentInsetStartWithNavigation="64dp"
android:navigationIcon="@drawable/ic_search_24dp"
android:titleTextColor="@*android:color/text_color_primary"
android:title="@string/search_menu"
android:titleTextAppearance="@style/TextAppearance.SearchBar"
android:theme="?android:attr/actionBarTheme"/>
</android.support.v7.widget.CardView>
</FrameLayout>

2
res/values-sw600dp/dimens.xml
View File

@@ -66,6 +66,8 @@
<dimen name="search_result_item_image_margin_start">24dp</dimen>
<dimen name="search_result_item_image_margin_end">32dp</dimen>
<dimen name="search_bar_height">64dp</dimen>
<!-- Dimensions for Wifi Assistant Card -->
<dimen name="wifi_assistant_padding_top_bottom">24dp</dimen>
<dimen name="wifi_assistant_padding_start_end">24dp</dimen>

3
res/values/dimens.xml
View File

@@ -142,6 +142,9 @@
<dimen name="search_bar_margin">8dp</dimen>
<dimen name="search_bar_negative_margin">-8dp</dimen>
<dimen name="search_bar_height">48dp</dimen>
<dimen name="search_bar_text_size">16dp</dimen>
<!-- Dimensions for Wifi Assistant Card -->
<dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
<dimen name="wifi_assistant_padding_start_end">16dp</dimen>

4
res/values/styles.xml
View File

@@ -459,4 +459,8 @@
<item name="android:background">@color/material_grey_300</item>
</style>
<style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">
<item name="android:textSize">@dimen/search_bar_text_size</item>
</style>
</resources>

7
src/com/android/settings/search/SearchFragment.java
View File

@@ -30,6 +30,7 @@ import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -188,8 +189,12 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
// check. This ensures if we return, say, a LinearLayout in the tests, they won't fail.
View searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text);
if (searchText instanceof TextView) {
((TextView) searchText).setTextColor(getContext().getColorStateList(
TextView searchTextView = (TextView) searchText;
searchTextView.setTextColor(getContext().getColorStateList(
com.android.internal.R.color.text_color_primary));
searchTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getResources().getDimension(R.dimen.search_bar_text_size));
}
View editFrame = mSearchView.findViewById(com.android.internal.R.id.search_edit_frame);
if (editFrame != null) {