diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2013-10-14 22:48:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-14 22:48:46 +0000 |
| commit | fe3b58fbed7a02d3e9f559ed2f814b42934dc784 (patch) | |
| tree | 6300d08487338d4f9b570198cfdc26c0f5af6913 | |
| parent | c89e5a6af1514320f90329dadebdfa26a3ae93d2 (diff) | |
| parent | 2f0ec7af06e206b1747b93efbd65d88189fc2df1 (diff) | |
| download | frameworks_base-fe3b58fbed7a02d3e9f559ed2f814b42934dc784.zip frameworks_base-fe3b58fbed7a02d3e9f559ed2f814b42934dc784.tar.gz frameworks_base-fe3b58fbed7a02d3e9f559ed2f814b42934dc784.tar.bz2 | |
Merge "Update the print spooler action bar icon." into klp-dev
| -rw-r--r-- | packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png | bin | 0 -> 1133 bytes | |||
| -rw-r--r-- | packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png | bin | 0 -> 930 bytes | |||
| -rw-r--r-- | packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png | bin | 0 -> 1387 bytes | |||
| -rw-r--r-- | packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml | 2 | ||||
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java | 1 |
5 files changed, 2 insertions, 1 deletions
diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png Binary files differnew file mode 100644 index 0000000..09ab1a2 --- /dev/null +++ b/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png Binary files differnew file mode 100644 index 0000000..637d94e --- /dev/null +++ b/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png Binary files differnew file mode 100644 index 0000000..4d4b3cc --- /dev/null +++ b/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png 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 index 83019b9..02740a3 100644 --- a/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml +++ b/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml @@ -107,7 +107,7 @@ android:layout_marginStart="36dip" android:textAppearance="@style/PrintOptionTitleTextAppearance" android:labelFor="@+id/range_options_spinner" - android:text="@string/label_pages"> + android:text="@string/page_count_unknown"> </TextView> <Spinner diff --git a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java index d688932..be94ba4 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java +++ b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java @@ -93,6 +93,7 @@ public final class SelectPrinterFragment extends ListFragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); + getActivity().getActionBar().setIcon(R.drawable.ic_menu_print); } @Override |
