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

Commit fd9369c7 authored by Svetoslav's avatar Svetoslav
Browse files

Update the color pallete of the print options UI. 

The print options UI now uses the material theme with custom
branding collors that follow the rest of the system UI.

bug:16301325

Change-Id: I5fefcd95ada0172a028574550dcfdf628f9ce22d
parent 8fbd0dc3

packages/PrintSpooler/res/layout/print_activity.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:layout_height="wrap_content"

        android:padding="16dip"

        android:elevation="@dimen/preview_controls_elevation"

        android:background="?android:attr/colorForegroundInverse">

        android:background="?android:attr/colorPrimary">



        <Spinner

            android:id="@+id/destination_spinner"
@@ -51,7 +51,7 @@ 
        android:paddingEnd="16dip"

        android:orientation="horizontal"

        android:elevation="@dimen/preview_controls_elevation"

        android:background="?android:attr/colorForegroundInverse">

        android:background="?android:attr/colorPrimary">



        <TextView

            android:layout_width="wrap_content"

packages/PrintSpooler/res/layout/print_activity_controls.xml

+9 −10
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:elevation="@dimen/preview_controls_elevation"

    android:background="?android:attr/colorForegroundInverse">

    android:background="?android:attr/colorPrimary">



        <LinearLayout

         android:id="@+id/draggable_content"
@@ -61,6 +61,8 @@ 
                     android:layout_width="fill_parent"

                     android:layout_height="wrap_content"

                     style="?android:attr/editTextStyle"

                     android:singleLine="true"

                     android:ellipsize="end"

                     android:inputType="numberDecimal">

                 </view>
@@ -88,8 +90,7 @@ 
                 <Spinner

                     android:id="@+id/paper_size_spinner"

                     android:layout_width="fill_parent"

                     android:layout_height="wrap_content"

                     style="@style/PrintOptionSpinnerStyle">

                     android:layout_height="wrap_content">

                 </Spinner>



             </LinearLayout>
@@ -116,8 +117,7 @@ 
                 <Spinner

                     android:id="@+id/color_spinner"

                     android:layout_width="fill_parent"

                     android:layout_height="wrap_content"

                     style="@style/PrintOptionSpinnerStyle">

                     android:layout_height="wrap_content">

                 </Spinner>



             </LinearLayout>
@@ -144,8 +144,7 @@ 
                 <Spinner

                     android:id="@+id/orientation_spinner"

                     android:layout_width="fill_parent"

                     android:layout_height="wrap_content"

                     style="@style/PrintOptionSpinnerStyle">

                     android:layout_height="wrap_content">

                 </Spinner>



             </LinearLayout>
@@ -173,8 +172,7 @@ 
                 <Spinner

                     android:id="@+id/range_options_spinner"

                     android:layout_width="fill_parent"

                     android:layout_height="wrap_content"

                     style="@style/PrintOptionSpinnerStyle">

                     android:layout_height="wrap_content">

                 </Spinner>



             </LinearLayout>
@@ -207,7 +205,8 @@ 
                     android:layout_width="fill_parent"

                     android:layout_height="wrap_content"

                     android:layout_gravity="bottom|fill_horizontal"

                     style="@style/PrintOptionEditTextStyle"

                     android:singleLine="true"

                     android:ellipsize="end"

                     android:visibility="visible"

                     android:inputType="textNoSuggestions">

                 </view>

packages/PrintSpooler/res/layout/spinner_dropdown_item.xml

+4 −4
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:paddingStart="8dip"

    android:paddingEnd="8dip"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:orientation="vertical"

    android:gravity="start|center_vertical">
@@ -27,12 +25,13 @@ 
        android:id="@+id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        style="?android:attr/spinnerDropDownItemStyle"

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

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

        android:singleLine="true"

        android:ellipsize="end"

        android:textIsSelectable="false"

        android:gravity="top|left"

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

        android:duplicateParentState="true">

    </TextView>
@@ -40,12 +39,13 @@ 
        android:id="@+id/subtitle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        style="?android:attr/spinnerDropDownItemStyle"

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

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

        android:singleLine="true"

        android:ellipsize="end"

        android:textIsSelectable="false"

        android:visibility="gone"

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

        android:duplicateParentState="true">

    </TextView>

packages/PrintSpooler/res/values/styles.xml

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

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

-->



<resources>



    <style name="PrintOptionSpinnerStyle">

        <item name="android:paddingTop">0dip</item>

        <item name="android:paddingBottom">0dip</item>

        <item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item>

    </style>



    <style name="PrintOptionEditTextStyle">



         <item name="android:singleLine">true</item>

         <item name="android:ellipsize">end</item>

    </style>



</resources>

packages/PrintSpooler/res/values/themes.xml

+8 −1
Original line number Diff line number Diff line
@@ -16,11 +16,18 @@ 


<resources>



    <style name="PrintActivity" parent="@android:style/Theme.DeviceDefault.NoActionBar">

    <style name="PrintActivity" parent="@android:style/Theme.Material">

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowBackground">@android:color/transparent</item>

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