summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler/src
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2014-10-23 23:17:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-23 23:17:04 +0000
commit9920a0dcf15ba2036cdcc5d6548efa6b4a8bc944 (patch)
treee2e2e083547ee12506247fee0db51c2677b3a820 /packages/PrintSpooler/src
parentb31868df32ef287a561134ecbc96592f657763a3 (diff)
parent45e50e99cdb10b43b062612c2e87e75841f2c424 (diff)
downloadframeworks_base-9920a0dcf15ba2036cdcc5d6548efa6b4a8bc944.zip
frameworks_base-9920a0dcf15ba2036cdcc5d6548efa6b4a8bc944.tar.gz
frameworks_base-9920a0dcf15ba2036cdcc5d6548efa6b4a8bc944.tar.bz2
Merge "Set copies to one when saving to PDF." into lmp-mr1-dev
Diffstat (limited to 'packages/PrintSpooler/src')
-rw-r--r--packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index 01ea3c8..21c8b83 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -1412,12 +1412,16 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
mCopiesEditText.setEnabled(true);
mCopiesEditText.setFocusableInTouchMode(true);
} else {
+ CharSequence text = mCopiesEditText.getText();
+ if (TextUtils.isEmpty(text) || !MIN_COPIES_STRING.equals(text.toString())) {
+ mCopiesEditText.setText(MIN_COPIES_STRING);
+ }
mCopiesEditText.setEnabled(false);
mCopiesEditText.setFocusable(false);
}
if (mCopiesEditText.getError() == null
&& TextUtils.isEmpty(mCopiesEditText.getText())) {
- mCopiesEditText.setText(String.valueOf(MIN_COPIES));
+ mCopiesEditText.setText(MIN_COPIES_STRING);
mCopiesEditText.requestFocus();
}
}