diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-09 21:26:24 -0700 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2014-09-09 21:30:35 -0700 |
| commit | 3ab1ec05491d5da8eea070889c03b6ea4f2af5bc (patch) | |
| tree | dfd0ecbaf40b97e46473873bb287b42489463611 /packages/PrintSpooler | |
| parent | cd7955f66c3b1c47b477ae197ec15c586cec784e (diff) | |
| download | frameworks_base-3ab1ec05491d5da8eea070889c03b6ea4f2af5bc.zip frameworks_base-3ab1ec05491d5da8eea070889c03b6ea4f2af5bc.tar.gz frameworks_base-3ab1ec05491d5da8eea070889c03b6ea4f2af5bc.tar.bz2 | |
RTL support for print UI.
bug:16966145
Change-Id: I488d11f1941545630d52eea4c4d48c43667c6067
Diffstat (limited to 'packages/PrintSpooler')
3 files changed, 9 insertions, 4 deletions
diff --git a/packages/PrintSpooler/res/layout/print_activity.xml b/packages/PrintSpooler/res/layout/print_activity.xml index 30b9629..6b8aa47 100644 --- a/packages/PrintSpooler/res/layout/print_activity.xml +++ b/packages/PrintSpooler/res/layout/print_activity.xml @@ -98,7 +98,7 @@ android:id="@+id/print_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="16dip" + android:layout_marginStart="16dip" android:elevation="@dimen/preview_controls_elevation" android:background="@drawable/print_button"> </ImageButton> diff --git a/packages/PrintSpooler/src/com/android/printspooler/widget/PrintContentView.java b/packages/PrintSpooler/src/com/android/printspooler/widget/PrintContentView.java index c84b06a..970e3c0 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/widget/PrintContentView.java +++ b/packages/PrintSpooler/src/com/android/printspooler/widget/PrintContentView.java @@ -283,8 +283,13 @@ public final class PrintContentView extends ViewGroup implements View.OnClickLis mDynamicContent.layout(left, dynContentTop, right, dynContentBottom); MarginLayoutParams params = (MarginLayoutParams) mPrintButton.getLayoutParams(); - final int rightMargin = params.rightMargin; - final int printButtonLeft = right - mPrintButton.getMeasuredWidth() - rightMargin; + + final int printButtonLeft; + if (getLayoutDirection() == View.LAYOUT_DIRECTION_LTR) { + printButtonLeft = right - mPrintButton.getMeasuredWidth() - params.getMarginStart(); + } else { + printButtonLeft = left + params.getMarginStart(); + } final int printButtonTop = dynContentBottom - mPrintButton.getMeasuredHeight() / 2; final int printButtonRight = printButtonLeft + mPrintButton.getMeasuredWidth(); final int printButtonBottom = printButtonTop + mPrintButton.getMeasuredHeight(); diff --git a/packages/PrintSpooler/src/com/android/printspooler/widget/PrintOptionsLayout.java b/packages/PrintSpooler/src/com/android/printspooler/widget/PrintOptionsLayout.java index 71f4aa7..7a80a8b 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/widget/PrintOptionsLayout.java +++ b/packages/PrintSpooler/src/com/android/printspooler/widget/PrintOptionsLayout.java @@ -89,7 +89,7 @@ public final class PrintOptionsLayout extends ViewGroup { columnWidth - childParams.getMarginStart() - childParams.getMarginEnd(), MeasureSpec.EXACTLY); } else { - childWidthMeasureSpec = getChildMeasureSpec(heightMeasureSpec, + childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, getPaddingStart() + getPaddingEnd() + width, childParams.width); } |