Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 16238096: Merge changes Ife1c7cb0,I398ff797 into lmp-dev

Browse Source 
* commit '16238096409899271f40e4404646412a384b1512':
  Fixing controls allignment in print UI.
  Fix a crash in print spooler.
This commit is contained in:
Svet Ganov
2014-09-13 17:23:58 +00:00
committed by Android Git Automerger
parent 2fa31886bd 102f9398ee
commit b5be0803dd
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/PrintSpooler/res/layout/print_activity_controls.xml
View File

@@ -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">

2
packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java
View File

@@ -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();