Addressing comments for the print preview feature. (15cbc8a0) · Commits · e / os / android_frameworks_base

core/java/android/print/PageRange.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ public final class PageRange implements Parcelable {
		* @hide
		*/
		public boolean contains(int pageIndex) {
		return pageIndex >= mStart && pageIndex <= mEnd;
		return (pageIndex >= mStart) && (pageIndex <= mEnd);
		}

		/**

core/java/android/print/PrintManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ public final class PrintManager {

		private static final String LOG_TAG = "PrintManager";

		private static final boolean DEBUG = true;
		private static final boolean DEBUG = false;

		private static final int MSG_NOTIFY_PRINT_JOB_STATE_CHANGED = 1;

packages/PrintSpooler/res/layout/print_activity.xml

+4 −265

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:padding="16dip"
		android:elevation="8dip"
		android:elevation="@dimen/preview_controls_elevation"
		android:background="?android:attr/colorForegroundInverse">

		<Spinner
		@@ -50,7 +50,7 @@
		android:paddingStart="16dip"
		android:paddingEnd="16dip"
		android:orientation="horizontal"
		android:elevation="8dip"
		android:elevation="@dimen/preview_controls_elevation"
		android:background="?android:attr/colorForegroundInverse">

		<TextView
		@@ -103,274 +103,13 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="16dip"
		android:elevation="8dip"
		android:elevation="@dimen/preview_controls_elevation"
		android:background="@drawable/print_button">
		</ImageButton>

		<!-- Controls -->

		<LinearLayout
		android:id="@+id/dynamic_content"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:elevation="8dip"
		android:background="?android:attr/colorForegroundInverse">

		<LinearLayout
		android:id="@+id/draggable_content"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<com.android.printspooler.widget.PrintOptionsLayout
		android:id="@+id/options_container"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		printspooler:columnCount="@integer/print_option_column_count">

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Copies -->

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/copies_edittext"
		android:text="@string/label_copies">
		</TextView>

		<view
		class="com.android.printspooler.widget.FirstFocusableEditText"
		android:id="@+id/copies_edittext"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="?android:attr/editTextStyle"
		android:inputType="numberDecimal">
		</view>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Paper size -->

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/paper_size_spinner"
		android:text="@string/label_paper_size">
		</TextView>

		<Spinner
		android:id="@+id/paper_size_spinner"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="@style/PrintOptionSpinnerStyle">
		</Spinner>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Color -->

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/color_spinner"
		android:text="@string/label_color">
		</TextView>

		<Spinner
		android:id="@+id/color_spinner"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="@style/PrintOptionSpinnerStyle">
		</Spinner>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Orientation -->

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/orientation_spinner"
		android:text="@string/label_orientation">
		</TextView>

		<Spinner
		android:id="@+id/orientation_spinner"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="@style/PrintOptionSpinnerStyle">
		</Spinner>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Range options -->

		<TextView
		android:id="@+id/range_options_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/range_options_spinner"
		android:text="@string/page_count_unknown">
		</TextView>

		<Spinner
		android:id="@+id/range_options_spinner"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="@style/PrintOptionSpinnerStyle">
		</Spinner>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Pages -->

		<TextView
		android:id="@+id/page_range_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:text="@string/pages_range_example"
		android:labelFor="@+id/page_range_edittext"
		android:textAllCaps="false"
		android:visibility="visible">
		</TextView>

		<view
		class="com.android.printspooler.widget.FirstFocusableEditText"
		android:id="@+id/page_range_edittext"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom\|fill_horizontal"
		style="@style/PrintOptionEditTextStyle"
		android:visibility="visible"
		android:inputType="textNoSuggestions">
		</view>

		</LinearLayout>

		</com.android.printspooler.widget.PrintOptionsLayout>

		<!-- More options -->

		<LinearLayout
		android:id="@+id/more_options_container"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:paddingStart="28dip"
		android:paddingEnd="28dip"
		android:orientation="vertical"
		android:visibility="visible">

		<ImageView
		android:layout_width="fill_parent"
		android:layout_height="1dip"
		android:layout_gravity="fill_horizontal"
		android:background="?android:attr/colorControlNormal"
		android:contentDescription="@null">
		</ImageView>

		<Button
		android:id="@+id/more_options_button"
		style="?android:attr/borderlessButtonStyle"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="fill_horizontal"
		android:text="@string/more_options_button"
		android:gravity="start\|center_vertical"
		android:textAllCaps="false">
		</Button>

		<ImageView
		android:layout_width="fill_parent"
		android:layout_height="1dip"
		android:layout_gravity="fill_horizontal"
		android:background="?android:attr/colorControlNormal"
		android:contentDescription="@null">
		</ImageView>

		</LinearLayout>

		</LinearLayout>

		<!-- Expand/collapse handle -->

		<FrameLayout
		android:id="@+id/expand_collapse_handle"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content">

		<ImageView
		android:id="@+id/expand_collapse_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginBottom="8dip"
		android:layout_gravity="center"
		android:background="@drawable/ic_expand_more">
		</ImageView>

		</FrameLayout>

		</LinearLayout>
		<include layout="@layout/print_activity_controls"/>

		<!-- Content -->

packages/PrintSpooler/res/layout/print_activity_controls.xml

0 → 100644

+281 −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.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:printspooler="http://schemas.android.com/apk/res/com.android.printspooler"
		android:id="@+id/dynamic_content"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:elevation="@dimen/preview_controls_elevation"
		android:background="?android:attr/colorForegroundInverse">

		<LinearLayout
		android:id="@+id/draggable_content"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<com.android.printspooler.widget.PrintOptionsLayout
		android:id="@+id/options_container"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		printspooler:columnCount="@integer/print_option_column_count">

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Copies -->

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/copies_edittext"
		android:text="@string/label_copies">
		</TextView>

		<view
		class="com.android.printspooler.widget.FirstFocusableEditText"
		android:id="@+id/copies_edittext"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="?android:attr/editTextStyle"
		android:inputType="numberDecimal">
		</view>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Paper size -->

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/paper_size_spinner"
		android:text="@string/label_paper_size">
		</TextView>

		<Spinner
		android:id="@+id/paper_size_spinner"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="@style/PrintOptionSpinnerStyle">
		</Spinner>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Color -->

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/color_spinner"
		android:text="@string/label_color">
		</TextView>

		<Spinner
		android:id="@+id/color_spinner"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="@style/PrintOptionSpinnerStyle">
		</Spinner>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Orientation -->

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/orientation_spinner"
		android:text="@string/label_orientation">
		</TextView>

		<Spinner
		android:id="@+id/orientation_spinner"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="@style/PrintOptionSpinnerStyle">
		</Spinner>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Range options -->

		<TextView
		android:id="@+id/range_options_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:labelFor="@+id/range_options_spinner"
		android:text="@string/page_count_unknown">
		</TextView>

		<Spinner
		android:id="@+id/range_options_spinner"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="@style/PrintOptionSpinnerStyle">
		</Spinner>

		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dip"
		android:layout_marginEnd="16dip"
		android:orientation="vertical">

		<!-- Pages -->

		<TextView
		android:id="@+id/page_range_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginStart="12dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:text="@string/pages_range_example"
		android:labelFor="@+id/page_range_edittext"
		android:textAllCaps="false"
		android:visibility="visible">
		</TextView>

		<view
		class="com.android.printspooler.widget.FirstFocusableEditText"
		android:id="@+id/page_range_edittext"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom\|fill_horizontal"
		style="@style/PrintOptionEditTextStyle"
		android:visibility="visible"
		android:inputType="textNoSuggestions">
		</view>

		</LinearLayout>

		</com.android.printspooler.widget.PrintOptionsLayout>

		<!-- More options -->

		<LinearLayout
		android:id="@+id/more_options_container"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:paddingStart="28dip"
		android:paddingEnd="28dip"
		android:orientation="vertical"
		android:visibility="visible">

		<ImageView
		android:layout_width="fill_parent"
		android:layout_height="1dip"
		android:layout_gravity="fill_horizontal"
		android:background="?android:attr/colorControlNormal"
		android:contentDescription="@null">
		</ImageView>

		<Button
		android:id="@+id/more_options_button"
		style="?android:attr/borderlessButtonStyle"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="fill_horizontal"
		android:text="@string/more_options_button"
		android:gravity="start\|center_vertical"
		android:textAllCaps="false">
		</Button>

		<ImageView
		android:layout_width="fill_parent"
		android:layout_height="1dip"
		android:layout_gravity="fill_horizontal"
		android:background="?android:attr/colorControlNormal"
		android:contentDescription="@null">
		</ImageView>

		</LinearLayout>

		</LinearLayout>

		<!-- Expand/collapse handle -->

		<FrameLayout
		android:id="@+id/expand_collapse_handle"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content">

		<ImageView
		android:id="@+id/expand_collapse_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dip"
		android:layout_marginBottom="8dip"
		android:layout_gravity="center"
		android:background="@drawable/ic_expand_more">
		</ImageView>

		</FrameLayout>

		</LinearLayout>

packages/PrintSpooler/res/values/constants.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,4 +38,6 @@

		<dimen name="preview_list_padding">24dip</dimen>

		<dimen name="preview_controls_elevation">8dip</dimen>

		</resources>