diff options
41 files changed, 168 insertions, 194 deletions
diff --git a/core/res/res/drawable-hdpi/ic_grayedout_printer.png b/core/res/res/drawable-hdpi/ic_grayedout_printer.png Binary files differdeleted file mode 100644 index 5e54970d6b3f..000000000000 --- a/core/res/res/drawable-hdpi/ic_grayedout_printer.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_grayedout_printer.png b/core/res/res/drawable-mdpi/ic_grayedout_printer.png Binary files differdeleted file mode 100644 index 5e54970d6b3f..000000000000 --- a/core/res/res/drawable-mdpi/ic_grayedout_printer.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/ic_grayedout_printer.png b/core/res/res/drawable-xhdpi/ic_grayedout_printer.png Binary files differdeleted file mode 100644 index 5e54970d6b3f..000000000000 --- a/core/res/res/drawable-xhdpi/ic_grayedout_printer.png +++ /dev/null diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 99001e3a9209..6a58b670b666 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1339,7 +1339,6 @@ <java-symbol type="drawable" name="ic_text_dot" /> <java-symbol type="drawable" name="ic_print" /> <java-symbol type="drawable" name="ic_print_error" /> - <java-symbol type="drawable" name="ic_grayedout_printer" /> <java-symbol type="drawable" name="jog_dial_arrow_long_left_green" /> <java-symbol type="drawable" name="jog_dial_arrow_long_right_red" /> <java-symbol type="drawable" name="jog_dial_arrow_short_left_and_right" /> diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less.png Binary files differdeleted file mode 100644 index b6a5eb5fa48c..000000000000 --- a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more.png Binary files differdeleted file mode 100644 index 4e36bd29db9e..000000000000 --- a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_grayedout_printer.png b/packages/PrintSpooler/res/drawable-hdpi/ic_grayedout_printer.png Binary files differdeleted file mode 100644 index 5e54970d6b3f..000000000000 --- a/packages/PrintSpooler/res/drawable-hdpi/ic_grayedout_printer.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_restart.png b/packages/PrintSpooler/res/drawable-hdpi/ic_restart.png Binary files differdeleted file mode 100644 index bb9d855f7769..000000000000 --- a/packages/PrintSpooler/res/drawable-hdpi/ic_restart.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-hdpi/stat_notify_cancelling.png b/packages/PrintSpooler/res/drawable-hdpi/stat_notify_cancelling.png Binary files differdeleted file mode 100644 index 2757db05d657..000000000000 --- a/packages/PrintSpooler/res/drawable-hdpi/stat_notify_cancelling.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less.png Binary files differdeleted file mode 100644 index 428a94663194..000000000000 --- a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less.png +++ /dev/null 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 differdeleted file mode 100644 index 3220eeafa859..000000000000 --- a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less_24dp.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more.png Binary files differdeleted file mode 100644 index fbbd094bdc53..000000000000 --- a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more.png +++ /dev/null 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 differdeleted file mode 100644 index 5530f52e6b0c..000000000000 --- a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more_24dp.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_grayedout_printer.png b/packages/PrintSpooler/res/drawable-mdpi/ic_grayedout_printer.png Binary files differdeleted file mode 100644 index 5e54970d6b3f..000000000000 --- a/packages/PrintSpooler/res/drawable-mdpi/ic_grayedout_printer.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_restart.png b/packages/PrintSpooler/res/drawable-mdpi/ic_restart.png Binary files differdeleted file mode 100644 index bd611e8e24d2..000000000000 --- a/packages/PrintSpooler/res/drawable-mdpi/ic_restart.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-mdpi/stat_notify_cancelling.png b/packages/PrintSpooler/res/drawable-mdpi/stat_notify_cancelling.png Binary files differdeleted file mode 100644 index c1b380a7778f..000000000000 --- a/packages/PrintSpooler/res/drawable-mdpi/stat_notify_cancelling.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less.png Binary files differdeleted file mode 100644 index 6161c209482d..000000000000 --- a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more.png Binary files differdeleted file mode 100644 index 3a89805d503a..000000000000 --- a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_grayedout_printer.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_grayedout_printer.png Binary files differdeleted file mode 100644 index 5e54970d6b3f..000000000000 --- a/packages/PrintSpooler/res/drawable-xhdpi/ic_grayedout_printer.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_restart.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_restart.png Binary files differdeleted file mode 100644 index a7fdc0dfcb1d..000000000000 --- a/packages/PrintSpooler/res/drawable-xhdpi/ic_restart.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-xhdpi/stat_notify_cancelling.png b/packages/PrintSpooler/res/drawable-xhdpi/stat_notify_cancelling.png Binary files differdeleted file mode 100644 index fedc00e22e2a..000000000000 --- a/packages/PrintSpooler/res/drawable-xhdpi/stat_notify_cancelling.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less.png Binary files differdeleted file mode 100644 index 52a52d9fa7a6..000000000000 --- a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more.png Binary files differdeleted file mode 100644 index 15e6abd447fd..000000000000 --- a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less.png Binary files differdeleted file mode 100644 index 46811a1269ad..000000000000 --- a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more.png Binary files differdeleted file mode 100644 index 141f28b26264..000000000000 --- a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more.png +++ /dev/null diff --git a/packages/PrintSpooler/res/drawable/ic_clear.xml b/packages/PrintSpooler/res/drawable/ic_clear.xml new file mode 100644 index 000000000000..076e8ef37ad0 --- /dev/null +++ b/packages/PrintSpooler/res/drawable/ic_clear.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2018 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. + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" + android:fillColor="?android:colorForeground"/> +</vector> diff --git a/packages/PrintSpooler/res/drawable/ic_expand_less.xml b/packages/PrintSpooler/res/drawable/ic_expand_less.xml index 6f1ece17d393..c3e87dc9c4c3 100644 --- a/packages/PrintSpooler/res/drawable/ic_expand_less.xml +++ b/packages/PrintSpooler/res/drawable/ic_expand_less.xml @@ -1,43 +1,26 @@ <?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" - android:tint="?android:attr/colorControlActivated"> - </bitmap> - </item> - - <item - android:state_pressed="true"> - <bitmap - android:src="@drawable/ic_expand_less" - android:tint="?android:attr/colorControlActivated"> - </bitmap> - </item> - - <item> - <bitmap - android:src="@drawable/ic_expand_less" - android:tint="?android:attr/colorControlNormal"> - </bitmap> - </item> - -</selector> +<!-- + Copyright (C) 2018 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. + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" + android:fillColor="?android:colorForeground" /> +</vector>
\ No newline at end of file diff --git a/packages/PrintSpooler/res/drawable/ic_expand_more.xml b/packages/PrintSpooler/res/drawable/ic_expand_more.xml index 8d7145278988..3895144a5c1c 100644 --- a/packages/PrintSpooler/res/drawable/ic_expand_more.xml +++ b/packages/PrintSpooler/res/drawable/ic_expand_more.xml @@ -1,43 +1,26 @@ <?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" - android:tint="?android:attr/colorControlActivated"> - </bitmap> - </item> - - <item - android:state_pressed="true"> - <bitmap - android:src="@drawable/ic_expand_more" - android:tint="?android:attr/colorControlActivated"> - </bitmap> - </item> - - <item> - <bitmap - android:src="@drawable/ic_expand_more" - android:tint="?android:attr/colorControlNormal"> - </bitmap> - </item> - -</selector> +<!-- + Copyright (C) 2018 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. + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6l-6,-6L7.41,8.59z" + android:fillColor="?android:colorForeground" /> +</vector>
\ No newline at end of file diff --git a/packages/PrintSpooler/res/drawable/print_warning.xml b/packages/PrintSpooler/res/drawable/print_warning.xml deleted file mode 100644 index 35f0fed78a7f..000000000000 --- a/packages/PrintSpooler/res/drawable/print_warning.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 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. ---> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="96dp" - android:height="96dp" - android:viewportWidth="96.0" - android:viewportHeight="96.0"> - <path - android:fillColor="#C8CCCE" - android:pathData="M4,84H92L48,8 4,84zM52,72h-8v-8h8v8zM52,56H44V40h8v16z"/> -</vector> diff --git a/packages/PrintSpooler/res/layout/preview_page.xml b/packages/PrintSpooler/res/layout/preview_page.xml index aafdd8fc035c..8db347e3db4f 100644 --- a/packages/PrintSpooler/res/layout/preview_page.xml +++ b/packages/PrintSpooler/res/layout/preview_page.xml @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorPrimary"> + android:textColor="@android:color/white"> </TextView> <ImageView diff --git a/packages/PrintSpooler/res/layout/preview_page_error.xml b/packages/PrintSpooler/res/layout/preview_page_error.xml index 4e9fb7787010..99ab99d07c40 100644 --- a/packages/PrintSpooler/res/layout/preview_page_error.xml +++ b/packages/PrintSpooler/res/layout/preview_page_error.xml @@ -21,11 +21,14 @@ android:gravity="center"> <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="12dip" - android:src="@drawable/print_warning" - android:contentDescription="@null" /> + android:layout_width="120dp" + android:layout_height="110dp" + android:layout_marginBottom="12dip" + android:src="@*android:drawable/ic_print_error" + android:scaleType="fitEnd" + android:alpha="0.1" + android:tint="@android:color/black" + android:importantForAccessibility="no" /> <TextView android:layout_width="wrap_content" diff --git a/packages/PrintSpooler/res/layout/preview_page_loading.xml b/packages/PrintSpooler/res/layout/preview_page_loading.xml index 1af3a17ca227..918edd987a79 100644 --- a/packages/PrintSpooler/res/layout/preview_page_loading.xml +++ b/packages/PrintSpooler/res/layout/preview_page_loading.xml @@ -19,14 +19,13 @@ android:layout_height="fill_parent"> <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="36dip" + android:layout_width="120dp" + android:layout_height="110dp" android:layout_gravity="center" - android:src="@drawable/ic_grayedout_printer" - android:contentDescription="@null" - android:scaleType="centerInside" - android:adjustViewBounds="true"> - </ImageView> + android:src="@*android:drawable/ic_print" + android:scaleType="fitCenter" + android:alpha="0.1" + android:tint="@android:color/black" + android:importantForAccessibility="no" /> </FrameLayout> diff --git a/packages/PrintSpooler/res/layout/preview_page_selected.xml b/packages/PrintSpooler/res/layout/preview_page_selected.xml index 77f4727434e6..6727142dfc8b 100644 --- a/packages/PrintSpooler/res/layout/preview_page_selected.xml +++ b/packages/PrintSpooler/res/layout/preview_page_selected.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorPrimary"> + android:textColor="@android:color/white"> </TextView> <ImageView diff --git a/packages/PrintSpooler/res/layout/print_activity.xml b/packages/PrintSpooler/res/layout/print_activity.xml index 774f320d6fd2..212f398aa163 100644 --- a/packages/PrintSpooler/res/layout/print_activity.xml +++ b/packages/PrintSpooler/res/layout/print_activity.xml @@ -29,7 +29,7 @@ android:paddingStart="8dip" android:layout_marginEnd="16dp" android:elevation="@dimen/preview_controls_elevation" - android:background="?android:attr/colorPrimary"> + style="?android:actionBarStyle"> <com.android.printspooler.widget.ClickInterceptSpinner android:id="@+id/destination_spinner" @@ -55,7 +55,7 @@ android:paddingBottom="8dip" android:orientation="horizontal" android:elevation="@dimen/preview_controls_elevation" - android:background="?android:attr/colorPrimary"> + style="?android:actionBarStyle"> <TextView android:layout_width="wrap_content" @@ -121,7 +121,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:animateLayoutChanges="true" - android:background="@color/print_preview_background_color" android:gravity="center"> <!-- Error message added here --> diff --git a/packages/PrintSpooler/res/layout/print_activity_controls.xml b/packages/PrintSpooler/res/layout/print_activity_controls.xml index 69d4f914a453..3aafc99da454 100644 --- a/packages/PrintSpooler/res/layout/print_activity_controls.xml +++ b/packages/PrintSpooler/res/layout/print_activity_controls.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:elevation="@dimen/preview_controls_elevation" - android:background="?android:attr/colorPrimary"> + style="?android:actionBarStyle"> <LinearLayout android:id="@+id/draggable_content" diff --git a/packages/PrintSpooler/res/layout/print_error_fragment.xml b/packages/PrintSpooler/res/layout/print_error_fragment.xml index 3ea2abdb5b5a..9d9dd0100481 100644 --- a/packages/PrintSpooler/res/layout/print_error_fragment.xml +++ b/packages/PrintSpooler/res/layout/print_error_fragment.xml @@ -16,35 +16,39 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginStart="16dip" + android:layout_marginEnd="16dip" 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> + android:layout_width="120dp" + android:layout_height="110dp" + android:layout_marginBottom="12dp" + android:src="@*android:drawable/ic_print_error" + android:scaleType="fitEnd" + android:alpha="0.1" + android:tint="?android:colorForeground" + android:importantForAccessibility="no" /> <TextView android:id="@+id/message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="16dip" - android:layout_marginEnd="16dip" - android:gravity="center_horizontal" - android:text="@string/print_error_default_message" - android:textAppearance="?android:attr/textAppearanceLargeInverse"> - </TextView> + android:layout_marginBottom="16dp" + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textColor="?android:attr/textColorSecondary" + android:text="@string/print_error_default_message" /> <Button android:id="@+id/action_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/print_error_retry"> - </Button> + style="?android:attr/borderlessButtonStyle" + android:textColor="?android:attr/textColorSecondary" + android:text="@string/print_add_printer" /> </LinearLayout> diff --git a/packages/PrintSpooler/res/layout/print_progress_fragment.xml b/packages/PrintSpooler/res/layout/print_progress_fragment.xml index 3b010f813e06..890716051d55 100644 --- a/packages/PrintSpooler/res/layout/print_progress_fragment.xml +++ b/packages/PrintSpooler/res/layout/print_progress_fragment.xml @@ -15,34 +15,39 @@ --> <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:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:gravity="center" android:orientation="vertical"> <ImageView + android:layout_width="120dp" + android:layout_height="110dp" + android:layout_marginBottom="12dp" + android:src="@*android:drawable/ic_print" + android:scaleType="fitEnd" + android:alpha="0.1" + android:tint="?android:colorForeground" + android:importantForAccessibility="no" /> + + <TextView + android:id="@+id/message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="12dip" - android:src="@drawable/ic_grayedout_printer" - android:contentDescription="@null"> - </ImageView> + android:layout_marginBottom="16dp" + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textColor="?android:attr/textColorSecondary" + android:text="@string/print_preparing_preview" /> <ProgressBar - android:layout_width="fill_parent" + android:layout_width="300dp" android:layout_height="wrap_content" android:indeterminate="true" - style="?android:attr/progressBarStyleHorizontal"> - </ProgressBar> - - <TextView - android:id="@+id/message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLargeInverse" - android:text="@string/print_preparing_preview"> - </TextView> + android:importantForAccessibility="no" + style="?android:attr/progressBarStyleHorizontal" /> </LinearLayout> diff --git a/packages/PrintSpooler/res/layout/select_printer_activity.xml b/packages/PrintSpooler/res/layout/select_printer_activity.xml index 91beff6993d2..681924b334d0 100644 --- a/packages/PrintSpooler/res/layout/select_printer_activity.xml +++ b/packages/PrintSpooler/res/layout/select_printer_activity.xml @@ -31,45 +31,48 @@ android:visibility="gone"> <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:gravity="center" android:orientation="vertical"> <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="12dip" - android:src="@*android:drawable/ic_grayedout_printer" - android:importantForAccessibility="no"> - </ImageView> + android:layout_width="120dp" + android:layout_height="110dp" + android:layout_marginBottom="12dp" + android:src="@*android:drawable/ic_print" + android:scaleType="fitEnd" + android:alpha="0.1" + android:tint="?android:colorForeground" + android:importantForAccessibility="no" /> <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginBottom="16dp" + android:gravity="center" android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="?android:attr/textColorSecondary" - android:text="@string/print_searching_for_printers"> - </TextView> + android:text="@string/print_searching_for_printers" /> <ProgressBar android:id="@+id/progress_bar" - android:layout_width="fill_parent" + android:layout_width="300dp" android:layout_height="wrap_content" android:indeterminate="true" - style="?android:attr/progressBarStyleHorizontal"> - </ProgressBar> + android:importantForAccessibility="no" + style="?android:attr/progressBarStyleHorizontal" /> <Button - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="?android:attr/buttonBarButtonStyle" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="@string/print_add_printer" - android:textAllCaps="true" /> + android:id="@+id/button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="?android:attr/borderlessButtonStyle" + android:textColor="?android:attr/textColorSecondary" + android:text="@string/print_add_printer" /> </LinearLayout> diff --git a/packages/PrintSpooler/res/values/colors.xml b/packages/PrintSpooler/res/values/colors.xml index 68bc6f277ad2..cb9e8866a396 100644 --- a/packages/PrintSpooler/res/values/colors.xml +++ b/packages/PrintSpooler/res/values/colors.xml @@ -18,8 +18,6 @@ <color name="print_preview_scrim_color">#99000000</color> - <color name="print_preview_background_color">#F2F1F2</color> - <color name="unselected_page_background_color">#C0C0C0</color> <color name="material_grey_500">#ffa3a3a3</color> diff --git a/packages/PrintSpooler/res/values/themes.xml b/packages/PrintSpooler/res/values/themes.xml index a968ffa9ed1d..844e9c9f0030 100644 --- a/packages/PrintSpooler/res/values/themes.xml +++ b/packages/PrintSpooler/res/values/themes.xml @@ -21,17 +21,14 @@ </style> <style name="Theme.SelectPrinterActivity" - parent="android:style/Theme.DeviceDefault.Light.DarkActionBar"> + parent="android:style/Theme.DeviceDefault.Light"> <item name="android:textAppearanceListItemSecondary">@style/ListItemSecondary</item> </style> - <style name="Theme.PrintActivity" parent="@android:style/Theme.DeviceDefault"> + <style name="Theme.PrintActivity" parent="@android:style/Theme.DeviceDefault.Light"> <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> </style> </resources> diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java index 9d737e0cd9d5..abdfad5bb27a 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java +++ b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java @@ -166,7 +166,7 @@ final class NotificationController { */ private Action createCancelAction(PrintJobInfo printJob) { return new Action.Builder( - Icon.createWithResource(mContext, R.drawable.stat_notify_cancelling), + Icon.createWithResource(mContext, R.drawable.ic_clear), mContext.getString(R.string.cancel), createCancelIntent(printJob)).build(); } @@ -225,7 +225,7 @@ final class NotificationController { private void createFailedNotification(PrintJobInfo printJob) { Action.Builder restartActionBuilder = new Action.Builder( - Icon.createWithResource(mContext, R.drawable.ic_restart), + Icon.createWithResource(mContext, com.android.internal.R.drawable.ic_restart), mContext.getString(R.string.restart), createRestartIntent(printJob.getId())); createNotification(printJob, createCancelAction(printJob), restartActionBuilder.build()); @@ -317,7 +317,7 @@ final class NotificationController { if (!printJob.isCancelling()) { return com.android.internal.R.drawable.ic_print; } else { - return R.drawable.stat_notify_cancelling; + return R.drawable.ic_clear; } } } |
