PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WifiSetup] Use framework AutoMirrored

Browse Source 
Use framework autoMirrored and override onResolveDrawables to
propagate the layout direction to the drawables.

Bug: 17047609
Change-Id: Ic4a764510e3a89c897d4e243f8fa2a690ac71899
This commit is contained in:
Maurice Lam
2014-08-15 12:04:12 -07:00
parent a7f8addd09
commit 8d449a0e36
8 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/widget/SetupWizardIllustration.java
View File

@@ -22,7 +22,6 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.util.LayoutDirection;
import android.util.Log;
import android.widget.FrameLayout;
@@ -46,7 +45,6 @@ public class SetupWizardIllustration extends FrameLayout {
private int mForegroundHeight = 0;
private float mScale = 1.0f;
private float mAspectRatio = 0.0f;
private boolean mAutoMirrored;
public SetupWizardIllustration(Context context) {
this(context, null);
@@ -67,8 +65,6 @@ public class SetupWizardIllustration extends FrameLayout {
TypedArray a = context.obtainStyledAttributes(attrs,
R.styleable.SetupWizardIllustration, 0, 0);
mAspectRatio = a.getFloat(R.styleable.SetupWizardIllustration_aspectRatio, 0.0f);
// TODO: Use framework autoMirrored supported in drawables instead b/17047609
mAutoMirrored = a.getBoolean(R.styleable.SetupWizardIllustration_autoMirrored, false);
a.recycle();
}
// Number of pixels of the 8dp baseline grid as defined in material design specs
@@ -94,6 +90,12 @@ public class SetupWizardIllustration extends FrameLayout {
mForeground = foreground;
}
@Override
public void onResolveDrawables(int layoutDirection) {
mBackground.setLayoutDirection(layoutDirection);
mForeground.setLayoutDirection(layoutDirection);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
if (mAspectRatio != 0.0f) {
@@ -136,10 +138,6 @@ public class SetupWizardIllustration extends FrameLayout {
@Override
public void onDraw(Canvas canvas) {
canvas.save();
if (mAutoMirrored && getLayoutDirection() == LayoutDirection.RTL) {
canvas.scale(-1, 1);
canvas.translate(-canvas.getWidth(), 0);
}
if (mBackground != null) {
canvas.save();
// Draw the background filling parts not covered by the illustration