Merge "Show new colored icon for PDF printer" into oc-dev am: f160c57eb1 (f0164ab7) · Commits · e / os / android_frameworks_base

packages/PrintSpooler/res/drawable/ic_pdf_printer.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2017 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="36dp"
		android:height="36dp"
		android:viewportWidth="48.0"
		android:viewportHeight="48.0"
		android:tint="@color/pdf_printer_color">
		<path
		android:pathData="M40,4L16,4c-2.21,0 -4,1.79 -4,4v24c0,2.21 1.79,4 4,4h24c2.21,0 4,-1.79 4,-4L44,8c0,-2.21 -1.79,-4 -4,-4zM23,19c0,1.66 -1.34,3 -3,3h-2v4h-3L15,14h5c1.66,0 3,1.34 3,3v2zM33,23c0,1.66 -1.34,3 -3,3h-5L25,14h5c1.66,0 3,1.34 3,3v6zM41,17h-3v2h3v3h-3v4h-3L35,14h6v3zM18,19h2v-2h-2v2zM8,12L4,12v28c0,2.21 1.79,4 4,4h28v-4L8,40L8,12zM28,23h2v-6h-2v6z"
		android:fillColor="@android:color/black"/>
		</vector>
		No newline at end of file

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,4 +24,5 @@

		<color name="material_grey_500">#ffa3a3a3</color>

		<color name="pdf_printer_color">#009688</color>
		</resources>

+2 −2

Original line number	Diff line number	Diff line
		@@ -2442,7 +2442,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
		if (position == 0 && getPdfPrinter() != null) {
		PrinterHolder printerHolder = (PrinterHolder) getItem(position);
		title = printerHolder.printer.getName();
		icon = getResources().getDrawable(R.drawable.ic_menu_savetopdf, null);
		icon = getResources().getDrawable(R.drawable.ic_pdf_printer, null);
		} else if (position == 1) {
		title = getMoreItemTitle();
		}
		@@ -2450,7 +2450,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
		if (position == 1 && getPdfPrinter() != null) {
		PrinterHolder printerHolder = (PrinterHolder) getItem(position);
		title = printerHolder.printer.getName();
		icon = getResources().getDrawable(R.drawable.ic_menu_savetopdf, null);
		icon = getResources().getDrawable(R.drawable.ic_pdf_printer, null);
		} else if (position == getCount() - 1) {
		title = getMoreItemTitle();
		} else {