diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2014-09-13 17:23:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-13 17:23:58 +0000 |
| commit | b5be0803dd14cbbb3e80433ed9ec9c813b93b8f4 (patch) | |
| tree | 0cacbd2a3ee005b4620f0c3fa393186853ae40d2 /packages/PrintSpooler | |
| parent | 2fa31886bd724c9a2ab2b58ff163d172f26fa883 (diff) | |
| parent | 102f9398eea4e7fe3bfd726480e36d6895eb95d4 (diff) | |
| download | frameworks_base-b5be0803dd14cbbb3e80433ed9ec9c813b93b8f4.zip frameworks_base-b5be0803dd14cbbb3e80433ed9ec9c813b93b8f4.tar.gz frameworks_base-b5be0803dd14cbbb3e80433ed9ec9c813b93b8f4.tar.bz2 | |
am 16238096: Merge changes Ife1c7cb0,I398ff797 into lmp-dev
* commit '16238096409899271f40e4404646412a384b1512':
Fixing controls allignment in print UI.
Fix a crash in print spooler.
Diffstat (limited to 'packages/PrintSpooler')
| -rw-r--r-- | packages/PrintSpooler/res/layout/print_activity_controls.xml | 16 | ||||
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/packages/PrintSpooler/res/layout/print_activity_controls.xml b/packages/PrintSpooler/res/layout/print_activity_controls.xml index f0b8adf..0bf64aa 100644 --- a/packages/PrintSpooler/res/layout/print_activity_controls.xml +++ b/packages/PrintSpooler/res/layout/print_activity_controls.xml @@ -59,6 +59,7 @@ android:id="@+id/copies_edittext" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_marginStart="8dip" style="?android:attr/editTextStyle" android:singleLine="true" android:ellipsize="end" @@ -89,7 +90,8 @@ <Spinner android:id="@+id/paper_size_spinner" android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginStart="4dip"> </Spinner> </LinearLayout> @@ -116,7 +118,8 @@ <Spinner android:id="@+id/color_spinner" android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginStart="4dip"> </Spinner> </LinearLayout> @@ -143,7 +146,8 @@ <Spinner android:id="@+id/orientation_spinner" android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginStart="4dip"> </Spinner> </LinearLayout> @@ -170,7 +174,8 @@ <Spinner android:id="@+id/range_options_spinner" android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginStart="4dip"> </Spinner> </LinearLayout> @@ -202,6 +207,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="bottom|fill_horizontal" + android:layout_marginStart="8dip" android:singleLine="true" android:ellipsize="end" android:visibility="visible" @@ -239,7 +245,7 @@ android:id="@+id/expand_collapse_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dip" + android:layout_marginTop="0dip" android:layout_marginBottom="4dip" android:layout_gravity="center" android:background="@drawable/ic_expand_more"> diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java b/packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java index 429437d..c53fcad 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java +++ b/packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java @@ -107,11 +107,13 @@ public final class RemotePrintDocument { mDocumentInfo.info.getPageCount()); } // Notify we are done. + mState = STATE_UPDATED; notifyUpdateCompleted(); } } } else { // We always notify after a write. + mState = STATE_UPDATED; notifyUpdateCompleted(); } runPendingCommand(); |