diff options
Diffstat (limited to 'packages/PrintSpooler')
-rw-r--r-- | packages/PrintSpooler/res/values-zh-rCN/arrays.xml | 37 | ||||
-rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java | 16 |
2 files changed, 53 insertions, 0 deletions
diff --git a/packages/PrintSpooler/res/values-zh-rCN/arrays.xml b/packages/PrintSpooler/res/values-zh-rCN/arrays.xml new file mode 100644 index 0000000..4fc75db --- /dev/null +++ b/packages/PrintSpooler/res/values-zh-rCN/arrays.xml @@ -0,0 +1,37 @@ +<?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. +--> +<resources> + + <string-array name="pdf_printer_media_sizes" translatable="false"> + <item>ROC_8K</item> + <item>ROC_16K</item> + <item>PRC_1</item> + <item>PRC_2</item> + <item>PRC_3</item> + <item>PRC_4</item> + <item>PRC_5</item> + <item>PRC_6</item> + <item>PRC_7</item> + <item>PRC_8</item> + <item>PRC_9</item> + <item>PRC_10</item> + <item>PRC_16K</item> + <item>OM_PA_KAI</item> + <item>OM_DAI_PA_KAI</item> + <item>OM_JUURO_KU_KAI</item> + </string-array> + +</resources> diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index e8a5e43..1fb84b4 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -371,6 +371,22 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat } @Override + protected void onDestroy() { + if (mState != STATE_INITIALIZING) { + mPrintPreviewController.destroy(new Runnable() { + @Override + public void run() { + finish(); + } + }); + } else { + finish(); + } + + super.onDestroy(); + } + + @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { event.startTracking(); |