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

am 3d9267f3: am 40a252ce: am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev

Browse Source 
* commit '3d9267f307ea484a46b95c80ac501fc4ee1fc4c2':
  [FRP] Add illustration to lock screen setup
This commit is contained in:
Maurice Lam
2014-12-09 00:55:37 +00:00
committed by Android Git Automerger
parent 2e07b9e83e 3d9267f307
commit 10a4d5c2de
35 changed files with 84 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SetupChooseLockGeneric.java
View File

@@ -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());
}

2
src/com/android/settings/SetupChooseLockPassword.java
View File

@@ -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());
}

2
src/com/android/settings/SetupChooseLockPattern.java
View File

@@ -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());
}

2
src/com/android/settings/SetupEncryptionInterstitial.java
View File

@@ -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);
}
}

3
src/com/android/settings/SetupRedactionInterstitial.java
View File

@@ -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);
}
}

25
src/com/android/settings/SetupWizardUtils.java
View File

@@ -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);
}
}
}
}