diff --git a/res/drawable-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-hdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..db697a0d8f5 Binary files /dev/null and b/res/drawable-hdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-hdpi/setup_illustration_wifi.jpg b/res/drawable-hdpi/setup_illustration_wifi.jpg new file mode 100644 index 00000000000..d38551ed33b Binary files /dev/null and b/res/drawable-hdpi/setup_illustration_wifi.jpg differ diff --git a/res/drawable-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-mdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..95e2b8c3e5f Binary files /dev/null and b/res/drawable-mdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-mdpi/setup_illustration_wifi.jpg b/res/drawable-mdpi/setup_illustration_wifi.jpg new file mode 100644 index 00000000000..a497bf55ce8 Binary files /dev/null and b/res/drawable-mdpi/setup_illustration_wifi.jpg differ diff --git a/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..03cd9d97ec6 Binary files /dev/null and b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-hdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg similarity index 100% rename from res/drawable-hdpi/setup_illustration_wifi_wide_image.jpg rename to res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg diff --git a/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..4a7ab38a056 Binary files /dev/null and b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-mdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg similarity index 100% rename from res/drawable-mdpi/setup_illustration_wifi_wide_image.jpg rename to res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg diff --git a/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..05f7725dcee Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-xhdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg similarity index 100% rename from res/drawable-xhdpi/setup_illustration_wifi_wide_image.jpg rename to res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg diff --git a/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..da3f7d935ff Binary files /dev/null and b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-xxhdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg similarity index 100% rename from res/drawable-xxhdpi/setup_illustration_wifi_wide_image.jpg rename to res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg diff --git a/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..fd5da99a7c9 Binary files /dev/null and b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-xxxhdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg similarity index 100% rename from res/drawable-xxxhdpi/setup_illustration_wifi_wide_image.jpg rename to res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg diff --git a/res/drawable-sw600dp/setup_illustration.xml b/res/drawable-sw600dp/setup_illustration.xml new file mode 100644 index 00000000000..c0e54e2fab7 --- /dev/null +++ b/res/drawable-sw600dp/setup_illustration.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/res/drawable-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..b6b856e2ea4 Binary files /dev/null and b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-xhdpi/setup_illustration_wifi.jpg b/res/drawable-xhdpi/setup_illustration_wifi.jpg new file mode 100644 index 00000000000..a399c19db77 Binary files /dev/null and b/res/drawable-xhdpi/setup_illustration_wifi.jpg differ diff --git a/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..4cb0c639e7c Binary files /dev/null and b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-nodpi/setup_illustration_wifi_image.jpg b/res/drawable-xxhdpi/setup_illustration_wifi.jpg similarity index 100% rename from res/drawable-nodpi/setup_illustration_wifi_image.jpg rename to res/drawable-xxhdpi/setup_illustration_wifi.jpg diff --git a/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg new file mode 100644 index 00000000000..13821f34caf Binary files /dev/null and b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg differ diff --git a/res/drawable-xxxhdpi/setup_illustration_wifi.jpg b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg new file mode 100644 index 00000000000..56c19b6a34e Binary files /dev/null and b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg differ diff --git a/res/drawable/setup_illustration_wifi_wide.xml b/res/drawable/setup_illustration.xml similarity index 70% rename from res/drawable/setup_illustration_wifi_wide.xml rename to res/drawable/setup_illustration.xml index 33ee2f60400..f8d96d54212 100644 --- a/res/drawable/setup_illustration_wifi_wide.xml +++ b/res/drawable/setup_illustration.xml @@ -18,16 +18,9 @@ - - - - - + - \ No newline at end of file + diff --git a/res/drawable/setup_illustration_wifi.xml b/res/drawable/setup_illustration_wifi.xml deleted file mode 100644 index 9db2f137680..00000000000 --- a/res/drawable/setup_illustration_wifi.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/res/layout-sw600dp-land/setup_preference.xml b/res/layout-sw600dp-land/setup_preference.xml index 431ac29e968..814bc915ced 100644 --- a/res/layout-sw600dp-land/setup_preference.xml +++ b/res/layout-sw600dp-land/setup_preference.xml @@ -22,10 +22,11 @@ android:orientation="vertical"> + android:foreground="@drawable/setup_illustration"> + android:foreground="@drawable/setup_illustration"> + android:foreground="@drawable/setup_illustration"> @@ -58,7 +58,7 @@ android:id="@+id/setup_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/illustration_phone" + android:layout_below="@id/setup_illustration" android:clipChildren="false"/> diff --git a/res/layout/setup_wizard_header.xml b/res/layout/setup_wizard_header.xml index c38a68d5809..b030ad1b53a 100644 --- a/res/layout/setup_wizard_header.xml +++ b/res/layout/setup_wizard_header.xml @@ -18,12 +18,12 @@ diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java index 2894f859a3c..c40e7c1a843 100644 --- a/src/com/android/settings/SetupChooseLockGeneric.java +++ b/src/com/android/settings/SetupChooseLockGeneric.java @@ -87,6 +87,8 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + SetupWizardUtils.setIllustration(getActivity(), + R.drawable.setup_illustration_lock_screen); SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle()); } diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java index ed6fab4c06a..0e531884b43 100644 --- a/src/com/android/settings/SetupChooseLockPassword.java +++ b/src/com/android/settings/SetupChooseLockPassword.java @@ -91,6 +91,8 @@ public class SetupChooseLockPassword extends ChooseLockPassword @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + SetupWizardUtils.setIllustration(getActivity(), + R.drawable.setup_illustration_lock_screen); SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle()); } diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java index b44dea1075f..ccd51fa25c3 100644 --- a/src/com/android/settings/SetupChooseLockPattern.java +++ b/src/com/android/settings/SetupChooseLockPattern.java @@ -89,6 +89,8 @@ public class SetupChooseLockPattern extends ChooseLockPattern @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + SetupWizardUtils.setIllustration(getActivity(), + R.drawable.setup_illustration_lock_screen); SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle()); } diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java index 53548bd2377..1e9a4631098 100644 --- a/src/com/android/settings/SetupEncryptionInterstitial.java +++ b/src/com/android/settings/SetupEncryptionInterstitial.java @@ -96,6 +96,8 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + SetupWizardUtils.setIllustration(getActivity(), + R.drawable.setup_illustration_lock_screen); SetupWizardUtils.setHeaderText(getActivity(), R.string.encryption_interstitial_header); } } diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java index 96f4dffd099..453e7299cbf 100644 --- a/src/com/android/settings/SetupRedactionInterstitial.java +++ b/src/com/android/settings/SetupRedactionInterstitial.java @@ -22,7 +22,6 @@ import com.android.setupwizard.navigationbar.SetupWizardNavBar; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.graphics.Color; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -96,6 +95,8 @@ public class SetupRedactionInterstitial extends RedactionInterstitial @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + SetupWizardUtils.setIllustration(getActivity(), + R.drawable.setup_illustration_lock_screen); SetupWizardUtils.setHeaderText(getActivity(), R.string.notification_section_header); } } diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index 0f54e63045a..3d44125c8c0 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -16,12 +16,17 @@ package com.android.settings; +import com.android.settings.widget.SetupWizardIllustration; import com.android.setupwizard.navigationbar.SetupWizardNavBar; import android.app.Activity; import android.content.Intent; import android.graphics.Color; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.LayerDrawable; +import android.view.Gravity; import android.view.Window; import android.widget.TextView; @@ -109,4 +114,24 @@ public class SetupWizardUtils { toIntent.putExtra(EXTRA_USE_IMMERSIVE_MODE, fromIntent.getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false)); } + + public static void setIllustration(Activity activity, int asset) { + SetupWizardIllustration illustration = + (SetupWizardIllustration) activity.findViewById(R.id.setup_illustration); + if (illustration != null) { + Drawable drawable = activity.getDrawable(R.drawable.setup_illustration); + Drawable newIllustration = activity.getDrawable(asset); + if (drawable instanceof LayerDrawable) { + LayerDrawable layers = (LayerDrawable) drawable; + Drawable oldIllustration = layers.findDrawableByLayerId(R.id.illustration_image); + if (newIllustration instanceof BitmapDrawable + && oldIllustration instanceof BitmapDrawable) { + final int gravity = ((BitmapDrawable) oldIllustration).getGravity(); + ((BitmapDrawable) newIllustration).setGravity(gravity); + } + layers.setDrawableByLayerId(R.id.illustration_image, newIllustration); + illustration.setForeground(layers); + } + } + } }