Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d431ffbe authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am 1fb5ea38: am 0acad1de: am 30d9161b: Merge "Printer list items have wrong width." into klp-dev 

* commit '1fb5ea38':
  Printer list items have wrong width.
parents 2d0391d1 1fb5ea38

packages/PrintSpooler/res/layout/printer_dropdown_item.xml

+8 −8
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:layout_marginEnd="8dip"

        android:duplicateParentState="true"

        android:contentDescription="@null"

        android:visibility="gone">

        android:visibility="invisible">

    </ImageView>



    <LinearLayout

packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -2303,8 +2303,6 @@ public class PrintJobConfigActivity extends Activity { 
                            R.layout.printer_dropdown_item, parent, false);

                }



                convertView.getLayoutParams().width = mDestinationSpinner.getWidth();



                CharSequence title = null;

                CharSequence subtitle = null;

                Drawable icon = null;
@@ -2353,7 +2351,7 @@ public class PrintJobConfigActivity extends Activity { 
                    iconView.setImageDrawable(icon);

                    iconView.setVisibility(View.VISIBLE);

                } else {

                    iconView.setVisibility(View.GONE);

                    iconView.setVisibility(View.INVISIBLE);

                }



                return convertView;