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

Commit 85933eb1 authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

Merge "Print UI polish." into lmp-dev

parents 13d43b92 c404cacd

packages/PrintSpooler/res/layout/print_activity.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        android:id="@+id/static_content"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:paddingStart="8dip"

        android:elevation="@dimen/preview_controls_elevation"

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

packages/PrintSpooler/res/layout/print_activity_controls.xml

+4 −6
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ 
                    android:text="@string/label_copies">

                </TextView>



                <view

                    class="com.android.printspooler.widget.FirstFocusableEditText"

                <EditText

                    android:id="@+id/copies_edittext"

                    android:layout_width="fill_parent"

                    android:layout_height="wrap_content"
@@ -64,7 +63,7 @@ 
                    android:singleLine="true"

                    android:ellipsize="end"

                    android:inputType="numberDecimal">

                </view>

                </EditText>



            </LinearLayout>
@@ -198,8 +197,7 @@ 
                    android:visibility="visible">

                </TextView>



                <view

                    class="com.android.printspooler.widget.FirstFocusableEditText"

                <EditText

                    android:id="@+id/page_range_edittext"

                    android:layout_width="fill_parent"

                    android:layout_height="wrap_content"
@@ -208,7 +206,7 @@ 
                    android:ellipsize="end"

                    android:visibility="visible"

                    android:inputType="textNoSuggestions">

                </view>

                </EditText>



            </LinearLayout>

packages/PrintSpooler/res/layout/printer_dropdown_item.xml

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

      android:layout_width="fill_parent"

      android:layout_height="wrap_content"

      android:paddingStart="16dip"

      android:paddingEnd="16dip"

      android:paddingStart="8dip"

      android:paddingEnd="8dip"

      android:minHeight="56dip"

      android:orientation="horizontal"

      android:gravity="start|center_vertical">

packages/PrintSpooler/res/layout/select_printer_activity.xml

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
        android:id="@android:id/list"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:paddingStart="@dimen/printer_list_view_padding_start"

        android:paddingEnd="@dimen/printer_list_view_padding_end"

        android:scrollbarStyle="outsideOverlay"

        android:cacheColorHint="@android:color/transparent"

        android:scrollbarAlwaysDrawVerticalTrack="true" >

packages/PrintSpooler/res/layout/spinner_dropdown_item.xml

deleted100644 → 0
+0 −52
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.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

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

    android:orientation="vertical"

    android:gravity="start|center_vertical">



    <TextView

        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:duplicateParentState="true">

    </TextView>



    <TextView

        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:duplicateParentState="true">

    </TextView>



</LinearLayout>