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

Commit 45cbf1fd authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am 06aecf1b: am 9dd0b996: am fd65373d: Merge "Print UI tweaks." into klp-dev 

* commit '06aecf1b':
  Print UI tweaks.
parents 28ff4040 06aecf1b

packages/PrintSpooler/res/drawable-hdpi/ic_restart.png

0 → 100644
+3.06 KiB
Loading image diff...

packages/PrintSpooler/res/drawable-mdpi/ic_restart.png

0 → 100644
+2.96 KiB
Loading image diff...

packages/PrintSpooler/res/drawable-xhdpi/ic_restart.png

0 → 100644
+3.14 KiB
Loading image diff...

packages/PrintSpooler/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
    <string name="printing_app_crashed">Printing app crashed</string>



    <!-- Title if the number of pages in a printed document is unknown. [CHAR LIMIT=20] -->

    <string name="page_count_unknown">unavailable</string>

    <string name="page_count_unknown">Pages</string>



    <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->

    <string name="generating_print_job">Generating print job</string>

packages/PrintSpooler/src/com/android/printspooler/NotificationController.java

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class NotificationController { 
                        printJob.getLabel()))

                .addAction(R.drawable.stat_notify_cancelling, mContext.getString(R.string.cancel),

                        createCancelIntent(printJob))

                .addAction(android.R.drawable.ic_secure, mContext.getString(R.string.restart),

                .addAction(R.drawable.ic_restart, mContext.getString(R.string.restart),

                        createRestartIntent(printJob.getId()))

                .setContentText(printJob.getPrinterName())

                .setWhen(System.currentTimeMillis())