[WifiSetup] Update illustrations

Update illustration assets and support for auto-mirroring for RTL
languages.

Bug: 16888091
Change-Id: I828a13558aff42f2ddb12b9afe123f463c4c1522
This commit is contained in:
Maurice Lam
2014-08-13 15:52:15 -07:00
parent 841f760fd7
commit d650726b44
12 changed files with 21 additions and 7 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -16,5 +16,5 @@
-->
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/grass_tile"
android:src="@drawable/setup_illustration_tile"
android:tileMode="repeat" />

View File

@@ -25,7 +25,7 @@
android:id="@+id/title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/grass">
android:background="@drawable/setup_illustration_bg">
<TextView
android:id="@+id/title"

View File

@@ -16,6 +16,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:id="@+id/fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -25,8 +26,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:foreground="@drawable/illustration_wifi_wide"
android:background="@drawable/grass">
android:foreground="@drawable/setup_illustration_wifi_wide"
android:background="@drawable/setup_illustration_bg"
settings:autoMirrored="true">
<LinearLayout
android:layout_width="match_parent"

View File

@@ -21,10 +21,11 @@
android:id="@+id/title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/grass"
android:foreground="@drawable/illustration_wifi"
android:background="@drawable/setup_illustration_bg"
android:foreground="@drawable/setup_illustration_wifi"
android:tag="stickyContainer"
settings:aspectRatio="2.0">
settings:aspectRatio="2.0"
settings:autoMirrored="true">
<TextView
android:id="@+id/title"

View File

@@ -24,6 +24,7 @@
<declare-styleable name="SetupWizardIllustration">
<attr name="aspectRatio" format="float" />
<attr name="autoMirrored" format="boolean" />
</declare-styleable>
<declare-styleable name="BatteryHistoryChart">

View File

@@ -22,6 +22,7 @@ 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;
@@ -45,6 +46,7 @@ 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);
@@ -65,6 +67,8 @@ 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
@@ -131,6 +135,11 @@ 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
@@ -146,6 +155,7 @@ public class SetupWizardIllustration extends FrameLayout {
mForeground.draw(canvas);
canvas.restore();
}
canvas.restore();
super.onDraw(canvas);
}
}