diff options
| -rw-r--r-- | packages/PrintSpooler/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/PrintSpooler/res/drawable/ic_search.xml | 43 | ||||
| -rw-r--r-- | packages/PrintSpooler/res/layout/printer_list_item.xml | 4 | ||||
| -rw-r--r-- | packages/PrintSpooler/res/menu/select_printer_activity.xml | 2 | ||||
| -rw-r--r-- | packages/PrintSpooler/res/values/themes.xml | 10 |
5 files changed, 47 insertions, 14 deletions
diff --git a/packages/PrintSpooler/AndroidManifest.xml b/packages/PrintSpooler/AndroidManifest.xml index 260ee39..9a62864 100644 --- a/packages/PrintSpooler/AndroidManifest.xml +++ b/packages/PrintSpooler/AndroidManifest.xml @@ -69,7 +69,7 @@ <activity android:name=".ui.SelectPrinterActivity" android:label="@string/all_printers_label" - android:theme="@style/SelectPrinterActivityTheme" + android:theme="@android:style/Theme.Material.Settings" android:exported="false"> </activity> diff --git a/packages/PrintSpooler/res/drawable/ic_search.xml b/packages/PrintSpooler/res/drawable/ic_search.xml new file mode 100644 index 0000000..991fa38 --- /dev/null +++ b/packages/PrintSpooler/res/drawable/ic_search.xml @@ -0,0 +1,43 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:autoMirrored="true"> + + <item + android:state_checked="true"> + <bitmap + android:src="@*android:drawable/ic_menu_search" + android:tint="?android:attr/colorControlActivated"> + </bitmap> + </item> + + <item + android:state_pressed="true"> + <bitmap + android:src="@*android:drawable/ic_menu_search" + android:tint="?android:attr/colorControlActivated"> + </bitmap> + </item> + + <item> + <bitmap + android:src="@*android:drawable/ic_menu_search" + android:tint="?android:attr/colorControlNormal"> + </bitmap> + </item> + +</selector> diff --git a/packages/PrintSpooler/res/layout/printer_list_item.xml b/packages/PrintSpooler/res/layout/printer_list_item.xml index 1f5efbc..7bc144a 100644 --- a/packages/PrintSpooler/res/layout/printer_list_item.xml +++ b/packages/PrintSpooler/res/layout/printer_list_item.xml @@ -49,7 +49,7 @@ android:ellipsize="end" android:textIsSelectable="false" android:gravity="top|start" - android:textColor="?android:attr/textColorSecondary" + android:textColor="?android:attr/textColorPrimary" android:duplicateParentState="true"> </TextView> @@ -62,7 +62,7 @@ android:ellipsize="end" android:textIsSelectable="false" android:visibility="gone" - android:textColor="?android:attr/textColorSecondary" + android:textColor="?android:attr/textColorPrimary" android:duplicateParentState="true"> </TextView> diff --git a/packages/PrintSpooler/res/menu/select_printer_activity.xml b/packages/PrintSpooler/res/menu/select_printer_activity.xml index ee62f9f..8da5769 100644 --- a/packages/PrintSpooler/res/menu/select_printer_activity.xml +++ b/packages/PrintSpooler/res/menu/select_printer_activity.xml @@ -19,7 +19,7 @@ <item android:id="@+id/action_search" android:title="@string/search" - android:icon="@*android:drawable/ic_menu_search_holo_light" + android:icon="@*android:drawable/ic_search" android:actionViewClass="android.widget.SearchView" android:showAsAction="ifRoom|collapseActionView" android:alphabeticShortcut="f" diff --git a/packages/PrintSpooler/res/values/themes.xml b/packages/PrintSpooler/res/values/themes.xml index 227451f..7d0da14 100644 --- a/packages/PrintSpooler/res/values/themes.xml +++ b/packages/PrintSpooler/res/values/themes.xml @@ -22,20 +22,10 @@ <item name="android:windowContentOverlay">@null</item> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> - <item name="android:backgroundDimEnabled">false</item> - <item name="android:colorPrimary">@*android:color/material_blue_grey_900</item> <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_950</item> <item name="android:colorAccent">@*android:color/material_dark_teal_A400</item> </style> - <style name="SelectPrinterActivityTheme" parent="@android:style/Theme.DeviceDefault.Light"> - <item name="android:actionBarStyle">@style/SelectPrinterActivityActionBarStyle</item> - </style> - - <style name="SelectPrinterActivityActionBarStyle" parent="@android:style/Widget.DeviceDefault.Light.ActionBar"> - <item name="android:displayOptions">showTitle</item> - </style> - </resources> |