diff options
Diffstat (limited to 'packages/PrintSpooler/res')
39 files changed, 712 insertions, 514 deletions
diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less_24dp.png b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less_24dp.png Binary files differnew file mode 100644 index 0000000..d2e5408 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less_24dp.png diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more_24dp.png b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more_24dp.png Binary files differnew file mode 100644 index 0000000..f4c4b0c --- /dev/null +++ b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more_24dp.png diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_grayedout_printer.png b/packages/PrintSpooler/res/drawable-hdpi/ic_grayedout_printer.png Binary files differnew file mode 100644 index 0000000..5e54970 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-hdpi/ic_grayedout_printer.png diff --git a/packages/PrintSpooler/res/drawable-hdpi/print_button_background.png b/packages/PrintSpooler/res/drawable-hdpi/print_button_background.png Binary files differnew file mode 100644 index 0000000..88e8495 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-hdpi/print_button_background.png diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less_24dp.png b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less_24dp.png Binary files differnew file mode 100644 index 0000000..3220eea --- /dev/null +++ b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less_24dp.png diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more_24dp.png b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more_24dp.png Binary files differnew file mode 100644 index 0000000..5530f52 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more_24dp.png diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_grayedout_printer.png b/packages/PrintSpooler/res/drawable-mdpi/ic_grayedout_printer.png Binary files differnew file mode 100644 index 0000000..5e54970 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-mdpi/ic_grayedout_printer.png diff --git a/packages/PrintSpooler/res/drawable-mdpi/print_button_background.png b/packages/PrintSpooler/res/drawable-mdpi/print_button_background.png Binary files differnew file mode 100644 index 0000000..3a37b27 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-mdpi/print_button_background.png diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less_24dp.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less_24dp.png Binary files differnew file mode 100644 index 0000000..f007427 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less_24dp.png diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more_24dp.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more_24dp.png Binary files differnew file mode 100644 index 0000000..43debb3 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more_24dp.png diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_grayedout_printer.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_grayedout_printer.png Binary files differnew file mode 100644 index 0000000..5e54970 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-xhdpi/ic_grayedout_printer.png diff --git a/packages/PrintSpooler/res/drawable-xhdpi/print_button_background.png b/packages/PrintSpooler/res/drawable-xhdpi/print_button_background.png Binary files differnew file mode 100644 index 0000000..b2ed8cd --- /dev/null +++ b/packages/PrintSpooler/res/drawable-xhdpi/print_button_background.png diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less_24dp.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less_24dp.png Binary files differnew file mode 100644 index 0000000..39bc2ba --- /dev/null +++ b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less_24dp.png diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more_24dp.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more_24dp.png Binary files differnew file mode 100644 index 0000000..664f3f2 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more_24dp.png diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less_24dp.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less_24dp.png Binary files differnew file mode 100644 index 0000000..fe9c539 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less_24dp.png diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more_24dp.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more_24dp.png Binary files differnew file mode 100644 index 0000000..18d075c --- /dev/null +++ b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more_24dp.png diff --git a/packages/PrintSpooler/res/drawable/ic_expand_less.xml b/packages/PrintSpooler/res/drawable/ic_expand_less.xml new file mode 100644 index 0000000..b0c7d51 --- /dev/null +++ b/packages/PrintSpooler/res/drawable/ic_expand_less.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="@drawable/ic_expand_less_24dp" + android:tint="?android:attr/colorControlActivated"> + </bitmap> + </item> + + <item + android:state_pressed="true"> + <bitmap + android:src="@drawable/ic_expand_less_24dp" + android:tint="?android:attr/colorControlActivated"> + </bitmap> + </item> + + <item> + <bitmap + android:src="@drawable/ic_expand_less_24dp" + android:tint="?android:attr/colorControlNormal"> + </bitmap> + </item> + +</selector> diff --git a/packages/PrintSpooler/res/drawable/ic_expand_more.xml b/packages/PrintSpooler/res/drawable/ic_expand_more.xml new file mode 100644 index 0000000..b809c25 --- /dev/null +++ b/packages/PrintSpooler/res/drawable/ic_expand_more.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="@drawable/ic_expand_more_24dp" + android:tint="?android:attr/colorControlActivated"> + </bitmap> + </item> + + <item + android:state_pressed="true"> + <bitmap + android:src="@drawable/ic_expand_more_24dp" + android:tint="?android:attr/colorControlActivated"> + </bitmap> + </item> + + <item> + <bitmap + android:src="@drawable/ic_expand_more_24dp" + android:tint="?android:attr/colorControlNormal"> + </bitmap> + </item> + +</selector> diff --git a/packages/PrintSpooler/res/layout/print_job_config_activity_container.xml b/packages/PrintSpooler/res/drawable/print_button.xml index 3303ef1..d4b6a82 100644 --- a/packages/PrintSpooler/res/layout/print_job_config_activity_container.xml +++ b/packages/PrintSpooler/res/drawable/print_button.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project +<!-- + 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 + 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, @@ -14,13 +15,10 @@ limitations under the License. --> -<com.android.printspooler.PrintDialogFrame xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - <FrameLayout - android:id="@+id/content_container" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@color/container_background"> - </FrameLayout> -</com.android.printspooler.PrintDialogFrame> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:tint="@color/print_button_tint_color" + android:pinned="true"> + <item + android:drawable="@drawable/print_button_background"> + </item> +</ripple> diff --git a/packages/PrintSpooler/res/layout/print_activity.xml b/packages/PrintSpooler/res/layout/print_activity.xml new file mode 100644 index 0000000..9715322 --- /dev/null +++ b/packages/PrintSpooler/res/layout/print_activity.xml @@ -0,0 +1,389 @@ +<?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. +--> + +<com.android.printspooler.widget.ContentView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:printspooler="http://schemas.android.com/apk/res/com.android.printspooler" + android:id="@+id/options_content" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:visibility="invisible" + android:background="?android:attr/colorForeground"> + + <FrameLayout + android:id="@+id/static_content" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:padding="16dip" + android:background="?android:attr/colorForegroundInverse"> + + <!-- Destination --> + + <Spinner + android:id="@+id/destination_spinner" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:dropDownWidth="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeightSmall"> + </Spinner> + + </FrameLayout> + + <!-- Summary --> + + <LinearLayout + android:id="@+id/summary_content" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingStart="16dip" + android:paddingEnd="16dip" + android:orientation="horizontal" + android:background="?android:attr/colorForegroundInverse"> + + <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_count_summary" + android:text="@string/label_copies_summary"> + </TextView> + + <TextView + android:id="@+id/copies_count_summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:layout_marginStart="16dip" + android:textAppearance="?android:attr/textAppearanceMedium"> + </TextView> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:layout_marginStart="32dip" + android:textAppearance="?android:attr/textAppearanceSmall" + android:labelFor="@+id/paper_size_summary" + android:text="@string/label_paper_size_summary"> + </TextView> + + <TextView + android:id="@+id/paper_size_summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:layout_marginStart="16dip" + android:textAppearance="?android:attr/textAppearanceMedium"> + </TextView> + + </LinearLayout> + + <FrameLayout + android:id="@+id/dynamic_content" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingBottom="16dip"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <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" + android:background="?android:attr/colorForegroundInverse" + 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" + android:background="?android:attr/colorForegroundInverse"> + + <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="?android:attr/listPreferredItemHeightSmall" + android:layout_marginBottom="28dip" + android:background="?android:attr/colorForegroundInverse" + android:elevation="12dip"> + + <ImageButton + android:id="@+id/expand_collapse_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:background="@drawable/ic_expand_more"> + </ImageButton> + + </FrameLayout> + + </LinearLayout> + + <!-- Print button --> + + <ImageButton + android:id="@+id/print_button" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:layout_marginEnd="16dip" + android:elevation="12dip" + android:background="@drawable/print_button" + android:src="@*android:drawable/ic_print"> + </ImageButton> + + </FrameLayout> + + + <FrameLayout + android:id="@+id/embedded_content_container" + android:layout_width="fill_parent" + android:layout_height="0dip" + android:animateLayoutChanges="true"> + </FrameLayout> + +</com.android.printspooler.widget.ContentView> diff --git a/packages/PrintSpooler/res/layout/print_error_fragment.xml b/packages/PrintSpooler/res/layout/print_error_fragment.xml new file mode 100644 index 0000000..dc44339 --- /dev/null +++ b/packages/PrintSpooler/res/layout/print_error_fragment.xml @@ -0,0 +1,47 @@ +<?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" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center" + android:orientation="vertical"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="12dip" + android:src="@drawable/ic_grayedout_printer" + android:contentDescription="@null"> + </ImageView> + + <TextView + android:id="@+id/message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/print_error_default_message" + android:textAppearance="?android:attr/textAppearanceLargeInverse"> + </TextView> + + <Button + android:id="@+id/action_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/print_error_retry"> + </Button> + +</LinearLayout> diff --git a/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml b/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml deleted file mode 100644 index e50a7af..0000000 --- a/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml +++ /dev/null @@ -1,282 +0,0 @@ -<?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. ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:scrollbars="vertical"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <!-- Destination --> - - <Spinner - android:id="@+id/destination_spinner" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="fill_horizontal" - android:layout_marginTop="24dip" - android:layout_marginStart="24dip" - android:layout_marginEnd="24dip" - android:minHeight="?android:attr/listPreferredItemHeightSmall"> - </Spinner> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="24dip" - android:orientation="horizontal" - android:baselineAligned="false"> - - <LinearLayout - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="vertical"> - - <!-- Copies --> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="12dip" - android:layout_marginStart="36dip" - android:layout_marginEnd="6dip" - android:textAppearance="@style/PrintOptionTitleTextAppearance" - android:labelFor="@+id/copies_edittext" - android:text="@string/label_copies"> - </TextView> - - <view - class="com.android.printspooler.PrintJobConfigActivity$CustomEditText" - android:id="@+id/copies_edittext" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginStart="24dip" - android:layout_marginEnd="6dip" - style="@style/PrintOptionEditTextStyle" - android:inputType="numberDecimal"> - </view> - - <!-- Color --> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="12dip" - android:layout_marginStart="36dip" - android:layout_marginEnd="6dip" - android:textAppearance="@style/PrintOptionTitleTextAppearance" - 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" - android:layout_marginStart="24dip" - android:layout_marginEnd="6dip" - style="@style/PrintOptionSpinnerStyle"> - </Spinner> - - <!-- Range options --> - - <TextView - android:id="@+id/range_options_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="12dip" - android:layout_marginStart="36dip" - android:textAppearance="@style/PrintOptionTitleTextAppearance" - 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" - android:layout_marginStart="24dip" - android:layout_marginEnd="6dip" - style="@style/PrintOptionSpinnerStyle"> - </Spinner> - - </LinearLayout> - - <LinearLayout - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="vertical"> - - <!-- Paper size --> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="12dip" - android:layout_marginStart="18dip" - android:layout_marginEnd="24dip" - android:textAppearance="@style/PrintOptionTitleTextAppearance" - 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" - android:layout_marginStart="6dip" - android:layout_marginEnd="24dip" - style="@style/PrintOptionSpinnerStyle"> - </Spinner> - - <!-- Orientation --> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="12dip" - android:layout_marginStart="18dip" - android:layout_marginEnd="24dip" - android:textAppearance="@style/PrintOptionTitleTextAppearance" - 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" - android:layout_marginStart="6dip" - android:layout_marginEnd="24dip" - style="@style/PrintOptionSpinnerStyle"> - </Spinner> - - <!-- Pages --> - - <TextView - android:id="@+id/page_range_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="12dip" - android:layout_marginStart="12dip" - android:layout_marginEnd="24dip" - android:textAppearance="@style/PrintOptionTitleTextAppearance" - android:text="@string/pages_range_example" - android:labelFor="@+id/page_range_edittext" - android:textAllCaps="false"> - </TextView> - - <view - class="com.android.printspooler.PrintJobConfigActivity$CustomEditText" - android:id="@+id/page_range_edittext" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginStart="6dip" - android:layout_marginEnd="24dip" - android:layout_gravity="bottom|fill_horizontal" - style="@style/PrintOptionEditTextStyle" - android:visibility="gone" - android:inputType="textNoSuggestions"> - </view> - - </LinearLayout> - - </LinearLayout> - - <!-- Advanced settings button --> - - <LinearLayout - android:id="@+id/advanced_settings_container" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <ImageView - android:layout_width="fill_parent" - android:layout_height="1dip" - android:layout_marginStart="24dip" - android:layout_marginEnd="24dip" - android:layout_gravity="fill_horizontal" - android:background="@color/separator" - android:contentDescription="@null"> - </ImageView> - - <Button - android:id="@+id/advanced_settings_button" - style="?android:attr/buttonBarButtonStyle" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginStart="24dip" - android:layout_marginEnd="24dip" - android:layout_gravity="fill_horizontal" - android:text="@string/advanced_settings_button" - android:gravity="start|center_vertical" - android:textSize="16sp" - android:textColor="@color/item_text_color"> - </Button> - - <ImageView - android:layout_width="fill_parent" - android:layout_height="1dip" - android:layout_gravity="fill_horizontal" - android:layout_marginStart="24dip" - android:layout_marginEnd="24dip" - android:background="@color/separator" - android:contentDescription="@null"> - </ImageView> - - </LinearLayout> - - <!-- Print button --> - - <FrameLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dip" - android:background="@color/action_button_background"> - - <ImageView - android:layout_width="fill_parent" - android:layout_height="1dip" - android:layout_gravity="fill_horizontal" - android:background="@color/separator" - android:contentDescription="@null"> - </ImageView> - - <Button - android:id="@+id/print_button" - style="?android:attr/buttonBarButtonStyle" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="fill_horizontal" - android:text="@string/print_button" - android:textSize="16sp" - android:textColor="@color/item_text_color"> - </Button> - - </FrameLayout> - - </LinearLayout> - -</ScrollView> diff --git a/packages/PrintSpooler/res/layout/print_job_config_activity_content_error.xml b/packages/PrintSpooler/res/layout/print_job_config_activity_content_error.xml deleted file mode 100644 index d9f0a9a..0000000 --- a/packages/PrintSpooler/res/layout/print_job_config_activity_content_error.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?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:id="@+id/content_generating" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - - <TextView - android:id="@+id/message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dip" - android:layout_marginEnd="16dip" - android:layout_marginTop="32dip" - android:layout_marginBottom="32dip" - android:layout_gravity="center" - style="?android:attr/buttonBarButtonStyle" - android:ellipsize="end" - android:text="@string/print_error_default_message" - android:textColor="@color/important_text" - android:textSize="16sp"> - </TextView> - - </LinearLayout> - - <FrameLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@color/action_button_background"> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="@color/separator"> - </View> - - <Button - android:id="@+id/ok_button" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="fill_horizontal" - style="?android:attr/buttonBarButtonStyle" - android:text="@android:string/ok" - android:textSize="16sp" - android:textColor="@color/important_text"> - </Button> - - </FrameLayout> - -</LinearLayout> diff --git a/packages/PrintSpooler/res/layout/print_job_config_activity_content_generating.xml b/packages/PrintSpooler/res/layout/print_job_config_activity_content_generating.xml deleted file mode 100644 index 10602ee..0000000 --- a/packages/PrintSpooler/res/layout/print_job_config_activity_content_generating.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?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:id="@+id/content_generating" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dip" - android:layout_marginEnd="16dip" - android:layout_gravity="center" - style="?android:attr/buttonBarButtonStyle" - android:singleLine="true" - android:ellipsize="end" - android:text="@string/generating_print_job" - android:textColor="@color/important_text" - android:textSize="16sp"> - </TextView> - - <ProgressBar - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="32dip" - android:layout_marginEnd="32dip" - android:layout_marginTop="16dip" - android:layout_marginBottom="32dip" - android:layout_gravity="center_horizontal" - style="?android:attr/progressBarStyleLarge"> - </ProgressBar> - - </LinearLayout> - - <FrameLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@color/action_button_background"> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="@color/separator"> - </View> - - <Button - android:id="@+id/cancel_button" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="fill_horizontal" - style="?android:attr/buttonBarButtonStyle" - android:text="@string/cancel" - android:textSize="16sp" - android:textColor="@color/important_text"> - </Button> - - </FrameLayout> - -</LinearLayout> diff --git a/packages/PrintSpooler/res/layout/print_progress_fragment.xml b/packages/PrintSpooler/res/layout/print_progress_fragment.xml new file mode 100644 index 0000000..212da9e --- /dev/null +++ b/packages/PrintSpooler/res/layout/print_progress_fragment.xml @@ -0,0 +1,65 @@ +<?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" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:orientation="vertical"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="12dip" + android:src="@drawable/ic_grayedout_printer" + android:contentDescription="@null"> + </ImageView> + + <ProgressBar + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:indeterminate="true" + style="?android:attr/progressBarStyleHorizontal"> + </ProgressBar> + + <FrameLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center" + android:animateLayoutChanges="true"> + + <TextView + android:id="@+id/message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLargeInverse" + android:text="@string/print_operation_canceling" + android:visibility="gone"> + </TextView> + + <Button + android:id="@+id/cancel_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@android:string/cancel"> + </Button> + + </FrameLayout> + +</LinearLayout> + diff --git a/packages/PrintSpooler/res/layout/printer_dropdown_item.xml b/packages/PrintSpooler/res/layout/printer_dropdown_item.xml index 1a61b99..43d8aaf 100644 --- a/packages/PrintSpooler/res/layout/printer_dropdown_item.xml +++ b/packages/PrintSpooler/res/layout/printer_dropdown_item.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:paddingStart="16dip" android:paddingEnd="16dip" - android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:minHeight="56dip" android:orientation="horizontal" android:gravity="start|center_vertical"> @@ -49,7 +49,7 @@ android:ellipsize="end" android:textIsSelectable="false" android:gravity="top|start" - android:textColor="@color/item_text_color" + android:textColor="?android:attr/textColorPrimary" android:duplicateParentState="true"> </TextView> @@ -62,7 +62,7 @@ android:ellipsize="end" android:textIsSelectable="false" android:visibility="gone" - android:textColor="@color/print_option_title" + android:textColor="?android:attr/textColorPrimary" android:duplicateParentState="true"> </TextView> diff --git a/packages/PrintSpooler/res/layout/printer_list_item.xml b/packages/PrintSpooler/res/layout/printer_list_item.xml index 47eb0b5..1f5efbc 100644 --- a/packages/PrintSpooler/res/layout/printer_list_item.xml +++ b/packages/PrintSpooler/res/layout/printer_list_item.xml @@ -15,13 +15,13 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:minHeight="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:gravity="start|center_vertical"> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:gravity="start|center_vertical"> <ImageView android:id="@+id/icon" @@ -31,7 +31,7 @@ android:layout_marginEnd="8dip" android:duplicateParentState="true" android:contentDescription="@null" - android:visibility="gone"> + android:visibility="invisible"> </ImageView> <LinearLayout @@ -49,7 +49,7 @@ android:ellipsize="end" android:textIsSelectable="false" android:gravity="top|start" - android:textColor="@color/item_text_color" + android:textColor="?android:attr/textColorSecondary" android:duplicateParentState="true"> </TextView> @@ -62,7 +62,7 @@ android:ellipsize="end" android:textIsSelectable="false" android:visibility="gone" - android:textColor="@color/print_option_title" + android:textColor="?android:attr/textColorSecondary" android:duplicateParentState="true"> </TextView> diff --git a/packages/PrintSpooler/res/layout/select_printer_activity.xml b/packages/PrintSpooler/res/layout/select_printer_activity.xml index 4488b6a..173057b 100644 --- a/packages/PrintSpooler/res/layout/select_printer_activity.xml +++ b/packages/PrintSpooler/res/layout/select_printer_activity.xml @@ -19,12 +19,16 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - <fragment - android:name="com.android.printspooler.SelectPrinterFragment" - android:id="@+id/select_printer_fragment" + <ListView + android:id="@android:id/list" android:layout_width="fill_parent" - android:layout_height="wrap_content"> - </fragment> + 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" > + </ListView> <FrameLayout android:id="@+id/empty_print_state" diff --git a/packages/PrintSpooler/res/layout/spinner_dropdown_item.xml b/packages/PrintSpooler/res/layout/spinner_dropdown_item.xml index c3c5021..1fb221a 100644 --- a/packages/PrintSpooler/res/layout/spinner_dropdown_item.xml +++ b/packages/PrintSpooler/res/layout/spinner_dropdown_item.xml @@ -32,7 +32,7 @@ android:ellipsize="end" android:textIsSelectable="false" android:gravity="top|left" - android:textColor="@color/item_text_color" + android:textColor="?android:attr/textColorPrimary" android:duplicateParentState="true"> </TextView> @@ -45,7 +45,7 @@ android:ellipsize="end" android:textIsSelectable="false" android:visibility="gone" - android:textColor="@color/print_option_title" + android:textColor="?android:attr/textColorPrimary" android:duplicateParentState="true"> </TextView> diff --git a/packages/PrintSpooler/res/values-km-rKH/strings.xml b/packages/PrintSpooler/res/values-km-rKH/strings.xml index ba3c042..c89f9bf 100644 --- a/packages/PrintSpooler/res/values-km-rKH/strings.xml +++ b/packages/PrintSpooler/res/values-km-rKH/strings.xml @@ -60,7 +60,7 @@ </plurals> <string name="cancel" msgid="4373674107267141885">"បោះបង់"</string> <string name="restart" msgid="2472034227037808749">"ចាប់ផ្ដើមឡើងវិញ"</string> - <string name="no_connection_to_printer" msgid="2159246915977282728">"គ្មានការភ្ជាប់ទៅម៉ាស៊ីនបោះពុម្ព"</string> + <string name="no_connection_to_printer" msgid="2159246915977282728">"គ្មានការភ្ជាប់ទៅម៉ាស៊ីនបោះពុម្ព"</string> <string name="reason_unknown" msgid="5507940196503246139">"មិនស្គាល់"</string> <string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> – មិនអាចប្រើបាន"</string> <string name="print_error_default_message" msgid="8568506918983980567">"មិនអាចបង្កើតការងារបោះពុម្ព"</string> diff --git a/packages/PrintSpooler/res/values-land/constants.xml b/packages/PrintSpooler/res/values-land/constants.xml index d68b77e..0db7513 100644 --- a/packages/PrintSpooler/res/values-land/constants.xml +++ b/packages/PrintSpooler/res/values-land/constants.xml @@ -18,5 +18,6 @@ <dimen name="printer_list_view_padding_start">48dip</dimen> <dimen name="printer_list_view_padding_end">48dip</dimen> + <integer name="print_option_column_count">3</integer> </resources> diff --git a/packages/PrintSpooler/res/values-sw600dp-land/constants.xml b/packages/PrintSpooler/res/values-sw600dp-land/constants.xml new file mode 100644 index 0000000..cacdf98 --- /dev/null +++ b/packages/PrintSpooler/res/values-sw600dp-land/constants.xml @@ -0,0 +1,21 @@ +<?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. +--> + +<resources> + + <integer name="print_option_column_count">6</integer> + +</resources> diff --git a/packages/PrintSpooler/res/layout/select_printer_fragment.xml b/packages/PrintSpooler/res/values-sw600dp/constants.xml index bbd012e..14c099c 100644 --- a/packages/PrintSpooler/res/layout/select_printer_fragment.xml +++ b/packages/PrintSpooler/res/values-sw600dp/constants.xml @@ -14,13 +14,8 @@ limitations under the License. --> -<ListView xmlns:android="http://schemas.android.com/apk/res/android" - 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" > -</ListView> +<resources> + + <integer name="print_option_column_count">3</integer> + +</resources> diff --git a/packages/PrintSpooler/res/values/attrs.xml b/packages/PrintSpooler/res/values/attrs.xml new file mode 100644 index 0000000..feb8be1 --- /dev/null +++ b/packages/PrintSpooler/res/values/attrs.xml @@ -0,0 +1,25 @@ +<?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. +--> + +<resources> + + <declare-styleable name="PrintOptionsLayout"> + + <attr name="columnCount" format="integer" /> + + </declare-styleable> + +</resources> diff --git a/packages/PrintSpooler/res/values/colors.xml b/packages/PrintSpooler/res/values/colors.xml index 4fc25b3..fd6ae19 100644 --- a/packages/PrintSpooler/res/values/colors.xml +++ b/packages/PrintSpooler/res/values/colors.xml @@ -16,10 +16,6 @@ <resources> - <color name="container_background">#F2F2F2</color> - <color name="important_text">#333333</color> - <color name="print_option_title">#888888</color> - <color name="separator">#CCCCCC</color> - <color name="action_button_background">#FFFFFF</color> + <color name="print_button_tint_color">#EEFF41</color> </resources> diff --git a/packages/PrintSpooler/res/values/constants.xml b/packages/PrintSpooler/res/values/constants.xml index e9c925c..9a2c14e 100644 --- a/packages/PrintSpooler/res/values/constants.xml +++ b/packages/PrintSpooler/res/values/constants.xml @@ -19,6 +19,8 @@ <integer name="page_option_value_all">0</integer> <integer name="page_option_value_page_range">1</integer> + <integer name="print_option_column_count">2</integer> + <integer-array name="page_options_values" translatable="false"> <item>@integer/page_option_value_all</item> <item>@integer/page_option_value_page_range</item> diff --git a/packages/PrintSpooler/res/values/strings.xml b/packages/PrintSpooler/res/values/strings.xml index d2613d0..d85529c 100644 --- a/packages/PrintSpooler/res/values/strings.xml +++ b/packages/PrintSpooler/res/values/strings.xml @@ -19,14 +19,8 @@ <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] --> <string name="app_label">Print Spooler</string> - <!-- Label of the print dialog's button for advanced printer settings. [CHAR LIMIT=25] --> - <string name="advanced_settings_button">Printer settings</string> - - <!-- Label of the print dialog's print button. [CHAR LIMIT=16] --> - <string name="print_button">Print</string> - - <!-- Label of the print dialog's save button. [CHAR LIMIT=16] --> - <string name="save_button">Save</string> + <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] --> + <string name="more_options_button">More options</string> <!-- Label of the destination widget. [CHAR LIMIT=20] --> <string name="label_destination">Destination</string> @@ -34,8 +28,14 @@ <!-- Label of the copies count widget. [CHAR LIMIT=20] --> <string name="label_copies">Copies</string> + <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] --> + <string name="label_copies_summary">Copies:</string> + <!-- Label of the paper size widget. [CHAR LIMIT=20] --> - <string name="label_paper_size">Paper Size</string> + <string name="label_paper_size">Paper size</string> + + <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] --> + <string name="label_paper_size_summary">Paper size:</string> <!-- Label of the color mode widget. [CHAR LIMIT=20] --> <string name="label_color">Color</string> @@ -118,19 +118,19 @@ <!-- Notifications --> - <!-- Template for the notificaiton label for a printing print job. [CHAR LIMIT=25] --> + <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] --> <string name="printing_notification_title_template">Printing <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string> - <!-- Template for the notificaiton label for a cancelling print job. [CHAR LIMIT=25] --> + <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] --> <string name="cancelling_notification_title_template">Cancelling <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string> - <!-- Template for the notificaiton label for a failed print job. [CHAR LIMIT=25] --> + <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] --> <string name="failed_notification_title_template">Printer error <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string> - <!-- Template for the notificaiton label for a blocked print job. [CHAR LIMIT=25] --> + <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] --> <string name="blocked_notification_title_template">Printer blocked <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string> - <!-- Template for the notificaiton label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] --> + <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] --> <plurals name="composite_notification_title_template"> <item quantity="one"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> print job</item> <item quantity="other"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> print jobs</item> @@ -139,7 +139,7 @@ <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] --> <string name="cancel">Cancel</string> - <!-- Label for the notification button for restrating a filed print job. [CHAR LIMIT=25] --> + <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] --> <string name="restart">Restart</string> <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] --> @@ -151,9 +151,6 @@ <!-- Label for a printer that is not available. [CHAR LIMIT=25] --> <string name="printer_unavailable"><xliff:g id="print_job_name" example="Canon-123GHT">%1$s</xliff:g> – unavailable</string> - <!-- Default message of an alert dialog for app error while generating a print job. [CHAR LIMIT=50] --> - <string name="print_error_default_message">Couldn\'t generate print job</string> - <!-- Arrays --> <!-- Color mode labels. --> @@ -200,4 +197,23 @@ holder to start the configuration activities of a print service. Should never be needed for normal apps.</string> + <!-- Error messages --> + + <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] --> + <string name="print_write_error_message">Couldn\'t write to file</string> + + <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] --> + <string name="print_error_default_message">Couldn\'t generate print job</string> + + <!-- Label for the retry button in the error message. [CHAR LIMIT=50] --> + <string name="print_error_retry">Retry</string> + + <!-- Message for the currently selected printer becoming unavailable. [CHAR LIMIT=50] --> + <string name="print_error_printer_unavailable">Printer unavailable</string> + + <!-- Long running operations --> + + <!-- Message for the cancel print operation UI while waiting for cancel to be performed. [CHAR LIMIT=50] --> + <string name="print_operation_canceling">Cancelling\u2026</string> + </resources> diff --git a/packages/PrintSpooler/res/values/styles.xml b/packages/PrintSpooler/res/values/styles.xml index d64380a..9637847 100644 --- a/packages/PrintSpooler/res/values/styles.xml +++ b/packages/PrintSpooler/res/values/styles.xml @@ -16,13 +16,6 @@ <resources> - <style name="PrintOptionTitleTextAppearance"> - <item name="android:textStyle">normal</item> - <item name="android:textSize">14sp</item> - <item name="android:textAllCaps">true</item> - <item name="android:textColor">@color/print_option_title</item> - </style> - <style name="PrintOptionSpinnerStyle"> <item name="android:paddingTop">0dip</item> <item name="android:paddingBottom">0dip</item> @@ -30,7 +23,7 @@ </style> <style name="PrintOptionEditTextStyle"> - <item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item> + <item name="android:singleLine">true</item> <item name="android:ellipsize">end</item> </style> diff --git a/packages/PrintSpooler/res/values/themes.xml b/packages/PrintSpooler/res/values/themes.xml index 94ab895..40bf725 100644 --- a/packages/PrintSpooler/res/values/themes.xml +++ b/packages/PrintSpooler/res/values/themes.xml @@ -16,15 +16,6 @@ <resources> - <style name="PrintJobConfigActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar"> - <item name="android:windowBackground">@android:color/transparent</item> - <item name="android:windowSoftInputMode">stateAlwaysHidden|adjustResize</item> - <item name="android:windowIsTranslucent">true</item> - <item name="android:backgroundDimEnabled">true</item> - <item name="android:colorBackgroundCacheHint">@android:color/transparent</item> - <item name="android:windowIsFloating">true</item> - </style> - <style name="SelectPrinterActivityTheme" parent="@android:style/Theme.DeviceDefault.Light"> <item name="android:actionBarStyle">@style/SelectPrinterActivityActionBarStyle</item> </style> |
