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

Commit 283203e2 authored by Svetoslav's avatar Svetoslav
Browse files

Style the all printers activity in material theme. 

bug:16301078

Change-Id: Ib96f1e232914802d0b5ddc874be4a4d24a74b685
parent 38408ff5

packages/PrintSpooler/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

packages/PrintSpooler/res/drawable/ic_search.xml

0 → 100644
+43 −0
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.

-->



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

packages/PrintSpooler/res/layout/printer_list_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

packages/PrintSpooler/res/menu/select_printer_activity.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

packages/PrintSpooler/res/values/themes.xml

+0 −10
Original line number Diff line number Diff line
@@ -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>