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

GLIF theme for settings

Browse Source 
Update fingerprint and screen lock setup to GLIF theme.

- Screen lock setup while in SUW
- Fingerprint setup, in and out of SUW

Bug: 26427729
Change-Id: I1063d3b54bbeea72de38bcc246cff368bc65945e
This commit is contained in:
Maurice Lam
2016-04-22 16:41:18 -07:00
parent 60a2e4d016
commit 190ec1c14a
32 changed files with 254 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@
package com.android.settings;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
@@ -25,20 +24,17 @@ import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.support.v14.preference.PreferenceFragment;
import android.support.v7.preference.Preference;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.fingerprint.SetupSkipDialog;
import com.android.setupwizardlib.SetupWizardLayout;
import com.android.setupwizardlib.SetupWizardPreferenceLayout;
import com.android.setupwizardlib.view.NavigationBar;
import com.android.setupwizardlib.GlifPreferenceLayout;
/**
* Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure
@@ -74,8 +70,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
layout.setFitsSystemWindows(false);
}
public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment
implements NavigationBar.NavigationBarListener {
public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment {
public static final String EXTRA_PASSWORD_QUALITY = ":settings:password_quality";
@@ -83,24 +78,14 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
SetupWizardUtils.setImmersiveMode(getActivity());
SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) view;
GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
layout.setDividerInset(getContext().getResources().getDimensionPixelSize(
R.dimen.suw_items_text_divider_inset));
final NavigationBar navigationBar = layout.getNavigationBar();
Button nextButton = navigationBar.getNextButton();
nextButton.setText(null);
nextButton.setEnabled(false);
navigationBar.setNavigationBarListener(this);
R.dimen.suw_items_glif_text_divider_inset));
layout.setIllustration(R.drawable.setup_illustration_lock_screen,
R.drawable.setup_illustration_horizontal_tile);
if (!mForFingerprint) {
layout.setHeaderText(R.string.setup_lock_settings_picker_title);
} else {
layout.setHeaderText(R.string.lock_settings_picker_title);
}
layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));
layout.setHeaderText(mForFingerprint ?
R.string.lock_settings_picker_title
: R.string.setup_lock_settings_picker_title);
// Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
// PreferenceFragment.
@@ -143,7 +128,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
@Override
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
Bundle savedInstanceState) {
SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) parent;
GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
}
@@ -251,17 +236,5 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
return intent;
}
@Override
public void onNavigateBack() {
Activity activity = getActivity();
if (activity != null) {
activity.onBackPressed();
}
}
@Override
public void onNavigateNext() {
}
}
}

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

@@ -16,7 +16,6 @@
package com.android.settings;
import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
@@ -27,9 +26,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import com.android.setupwizardlib.SetupWizardLayout;
import com.android.setupwizardlib.util.SystemBarHelper;
import com.android.setupwizardlib.view.NavigationBar;
import com.android.setupwizardlib.GlifLayout;
/**
* Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
@@ -91,27 +88,21 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
super.onApplyThemeResource(theme, resid, first);
}
public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment
implements NavigationBar.NavigationBarListener {
public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
private SetupWizardLayout mLayout;
private NavigationBar mNavigationBar;
private GlifLayout mLayout;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mLayout = (SetupWizardLayout) inflater.inflate(
mLayout = (GlifLayout) inflater.inflate(
R.layout.setup_choose_lock_password, container, false);
mNavigationBar = mLayout.getNavigationBar();
mNavigationBar.setNavigationBarListener(this);
return mLayout;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
SystemBarHelper.setImeInsetView(mLayout);
SetupWizardUtils.setImmersiveMode(getActivity());
mLayout.setHeaderText(getActivity().getTitle());
}
@@ -119,28 +110,5 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
protected Intent getRedactionInterstitialIntent(Context context) {
return null;
}
@Override
protected void setNextEnabled(boolean enabled) {
mNavigationBar.getNextButton().setEnabled(enabled);
}
@Override
protected void setNextText(int text) {
mNavigationBar.getNextButton().setText(text);
}
@Override
public void onNavigateBack() {
final Activity activity = getActivity();
if (activity != null) {
activity.onBackPressed();
}
}
@Override
public void onNavigateNext() {
handleNext();
}
}
}

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

@@ -16,7 +16,6 @@
package com.android.settings;
import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
@@ -26,11 +25,9 @@ import android.os.UserHandle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import com.android.setupwizardlib.SetupWizardLayout;
import com.android.setupwizardlib.view.NavigationBar;
import com.android.setupwizardlib.GlifLayout;
/**
* Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
@@ -86,87 +83,20 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
super.onApplyThemeResource(theme, resid, first);
}
public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment
implements NavigationBar.NavigationBarListener {
private NavigationBar mNavigationBar;
private Button mRetryButton;
public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final SetupWizardLayout layout = (SetupWizardLayout) inflater.inflate(
final GlifLayout layout = (GlifLayout) inflater.inflate(
R.layout.setup_choose_lock_pattern, container, false);
mNavigationBar = layout.getNavigationBar();
mNavigationBar.setNavigationBarListener(this);
layout.setHeaderText(getActivity().getTitle());
return layout;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
mRetryButton = (Button) view.findViewById(R.id.retryButton);
mRetryButton.setOnClickListener(this);
super.onViewCreated(view, savedInstanceState);
SetupWizardUtils.setImmersiveMode(getActivity());
}
@Override
protected Intent getRedactionInterstitialIntent(Context context) {
return null;
}
@Override
public void onClick(View v) {
if (v == mRetryButton) {
handleLeftButton();
} else {
super.onClick(v);
}
}
@Override
protected void setRightButtonEnabled(boolean enabled) {
mNavigationBar.getNextButton().setEnabled(enabled);
}
@Override
protected void setRightButtonText(int text) {
mNavigationBar.getNextButton().setText(text);
}
@Override
protected void updateStage(Stage stage) {
super.updateStage(stage);
// Only enable the button for retry
mRetryButton.setEnabled(stage == Stage.FirstChoiceValid);
switch (stage) {
case Introduction:
case HelpScreen:
case ChoiceTooShort:
case FirstChoiceValid:
mRetryButton.setVisibility(View.VISIBLE);
break;
case NeedToConfirm:
case ConfirmWrong:
case ChoiceConfirmed:
mRetryButton.setVisibility(View.INVISIBLE);
break;
}
}
@Override
public void onNavigateBack() {
final Activity activity = getActivity();
if (activity != null) {
activity.onBackPressed();
}
}
@Override
public void onNavigateNext() {
handleRightButton();
}
}
}

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

@@ -16,7 +16,6 @@
package com.android.settings;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
@@ -25,13 +24,10 @@ import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.setupwizardlib.SetupWizardLayout;
import com.android.setupwizardlib.SetupWizardPreferenceLayout;
import com.android.setupwizardlib.view.NavigationBar;
import com.android.setupwizardlib.GlifPreferenceLayout;
/**
* Setup Wizard's version of EncryptionInterstitial screen. It inherits the logic and basic
@@ -78,30 +74,18 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial {
layout.setFitsSystemWindows(false);
}
public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment
implements NavigationBar.NavigationBarListener {
public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
final SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) view;
final GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
layout.setDividerInset(getContext().getResources().getDimensionPixelSize(
R.dimen.suw_items_icon_divider_inset));
layout.setIllustration(R.drawable.setup_illustration_lock_screen,
R.drawable.setup_illustration_horizontal_tile);
final NavigationBar navigationBar = layout.getNavigationBar();
navigationBar.setNavigationBarListener(this);
Button nextButton = navigationBar.getNextButton();
nextButton.setText(null);
nextButton.setEnabled(false);
R.dimen.suw_items_glif_icon_divider_inset));
layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));
layout.setHeaderText(R.string.encryption_interstitial_header);
Activity activity = getActivity();
if (activity != null) {
SetupWizardUtils.setImmersiveMode(activity);
}
// Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
// PreferenceFragment.
@@ -118,21 +102,8 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial {
@Override
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
Bundle savedInstanceState) {
SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) parent;
GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
}
@Override
public void onNavigateBack() {
final Activity activity = getActivity();
if (activity != null) {
activity.onBackPressed();
}
}
@Override
public void onNavigateNext() {
// next is handled via the onPreferenceTreeClick method in EncryptionInterstitial
}
}
}

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

@@ -16,20 +16,16 @@
package com.android.settings;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserHandle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import com.android.settings.notification.RedactionInterstitial;
import com.android.setupwizardlib.SetupWizardLayout;
import com.android.setupwizardlib.view.NavigationBar;
/**
* Setup Wizard's version of RedactionInterstitial screen. It inherits the logic and basic structure
@@ -67,7 +63,7 @@ public class SetupRedactionInterstitial extends RedactionInterstitial {
}
public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment
implements NavigationBar.NavigationBarListener {
implements View.OnClickListener {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -78,29 +74,19 @@ public class SetupRedactionInterstitial extends RedactionInterstitial {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
final SetupWizardLayout layout =
(SetupWizardLayout) view.findViewById(R.id.setup_wizard_layout);
final NavigationBar navigationBar = layout.getNavigationBar();
navigationBar.setNavigationBarListener(this);
navigationBar.getBackButton().setVisibility(View.GONE);
SetupWizardUtils.setImmersiveMode(getActivity());
final Button button = (Button) view.findViewById(R.id.redaction_next_button);
button.setOnClickListener(this);
}
@Override
public void onNavigateBack() {
final Activity activity = getActivity();
if (activity != null) {
activity.onBackPressed();
}
}
@Override
public void onNavigateNext() {
final SetupRedactionInterstitial activity = (SetupRedactionInterstitial) getActivity();
if (activity != null) {
activity.setResult(RESULT_OK, activity.getResultIntentData());
finish();
public void onClick(View v) {
if (v.getId() == R.id.redaction_next_button) {
final SetupRedactionInterstitial activity =
(SetupRedactionInterstitial) getActivity();
if (activity != null) {
activity.setResult(RESULT_OK, activity.getResultIntentData());
finish();
}
}
}
}

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

@@ -24,14 +24,6 @@ import com.android.setupwizardlib.util.SystemBarHelper;
import com.android.setupwizardlib.util.WizardManagerHelper;
public class SetupWizardUtils {
private static final String TAG = "SetupWizardUtils";
// From WizardManager (must match constants maintained there)
public static final String EXTRA_SCRIPT_URI = "scriptUri";
public static boolean isUsingWizardManager(Activity activity) {
return activity.getIntent().hasExtra(EXTRA_SCRIPT_URI);
}
public static int getTheme(Intent intent) {
if (WizardManagerHelper.isLightTheme(intent, true)) {

24
src/com/android/settings/fingerprint/FingerprintEnrollBase.java
View File

@@ -23,15 +23,13 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.text.TextUtils;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.TextView;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.InstrumentedActivity;
import com.android.settings.R;
import com.android.setupwizardlib.SetupWizardLayout;
import com.android.setupwizardlib.view.NavigationBar;
import com.android.setupwizardlib.GlifLayout;
/**
* Base activity for all fingerprint enrollment steps.
@@ -71,38 +69,26 @@ public abstract class FingerprintEnrollBase extends InstrumentedActivity
}
protected void initViews() {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |
WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
getWindow().getDecorView().setSystemUiVisibility(
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
getWindow().setStatusBarColor(Color.TRANSPARENT);
getNavigationBar().setVisibility(View.GONE);
Button nextButton = getNextButton();
if (nextButton != null) {
nextButton.setOnClickListener(this);
}
}
protected NavigationBar getNavigationBar() {
return (NavigationBar) findViewById(R.id.suw_layout_navigation_bar);
}
protected SetupWizardLayout getSetupWizardLayout() {
return (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
protected GlifLayout getLayout() {
return (GlifLayout) findViewById(R.id.setup_wizard_layout);
}
protected void setHeaderText(int resId, boolean force) {
TextView layoutTitle = getSetupWizardLayout().getHeaderTextView();
TextView layoutTitle = getLayout().getHeaderTextView();
CharSequence previousTitle = layoutTitle.getText();
CharSequence title = getText(resId);
if (previousTitle != title || force) {
if (!TextUtils.isEmpty(previousTitle)) {
layoutTitle.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
}
getSetupWizardLayout().setHeaderText(title);
getLayout().setHeaderText(title);
setTitle(title);
}
}

10
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -36,9 +36,9 @@ import android.view.View;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockGeneric;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settingslib.HelpUtils;
import com.android.settings.R;
import com.android.setupwizardlib.SetupWizardRecyclerLayout;
import com.android.settingslib.HelpUtils;
import com.android.setupwizardlib.GlifRecyclerLayout;
import com.android.setupwizardlib.items.IItem;
import com.android.setupwizardlib.items.Item;
import com.android.setupwizardlib.items.RecyclerItemAdapter;
@@ -61,8 +61,7 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
super.onCreate(savedInstanceState);
setContentView(R.layout.fingerprint_enroll_introduction);
setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
final SetupWizardRecyclerLayout layout =
(SetupWizardRecyclerLayout) findViewById(R.id.setup_wizard_layout);
final GlifRecyclerLayout layout = (GlifRecyclerLayout) getLayout();
mUserManager = UserManager.get(this);
final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
adapter.setOnItemSelectedListener(this);
@@ -125,8 +124,7 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
}
protected Intent getFindSensorIntent() {
Intent intent = new Intent(this, FingerprintEnrollFindSensor.class);
return intent;
return new Intent(this, FingerprintEnrollFindSensor.class);
}
@Override

46
src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
View File

@@ -31,11 +31,8 @@ import android.widget.Button;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.setupwizardlib.util.SystemBarHelper;
import com.android.setupwizardlib.view.NavigationBar;
public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
implements NavigationBar.NavigationBarListener {
public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling {
private static final String TAG_DIALOG = "dialog";
@@ -54,32 +51,21 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
@Override
protected void initViews() {
SetupWizardUtils.setImmersiveMode(this);
super.initViews();
final Button skipButton = (Button) findViewById(R.id.skip_button);
skipButton.setVisibility(View.VISIBLE);
skipButton.setOnClickListener(this);
}
final View buttonBar = findViewById(R.id.button_bar);
if (buttonBar != null) {
buttonBar.setVisibility(View.GONE);
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.skip_button:
new SkipDialog().show(getFragmentManager(), TAG_DIALOG);
break;
default:
super.onClick(v);
}
final NavigationBar navigationBar = getNavigationBar();
navigationBar.setNavigationBarListener(this);
navigationBar.getNextButton().setText(R.string.skip_label);
navigationBar.getBackButton().setVisibility(View.GONE);
}
@Override
protected Button getNextButton() {
return getNavigationBar().getNextButton();
}
@Override
public void onNavigateBack() {
onBackPressed();
}
@Override
public void onNavigateNext() {
new SkipDialog().show(getFragmentManager(), TAG_DIALOG);
}
@Override
@@ -102,7 +88,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final AlertDialog dialog = new AlertDialog.Builder(getActivity())
return new AlertDialog.Builder(getActivity())
.setTitle(R.string.setup_fingerprint_enroll_enrolling_skip_title)
.setMessage(R.string.setup_fingerprint_enroll_enrolling_skip_message)
.setCancelable(false)
@@ -124,8 +110,6 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
}
})
.create();
SystemBarHelper.hideSystemBars(dialog);
return dialog;
}
}
}

34
src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
View File

@@ -19,17 +19,13 @@ package com.android.settings.fingerprint;
import android.content.Intent;
import android.content.res.Resources;
import android.os.UserHandle;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.setupwizardlib.view.NavigationBar;
public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor
implements NavigationBar.NavigationBarListener {
public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
@Override
protected int getContentView() {
@@ -53,34 +49,6 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
super.onApplyThemeResource(theme, resid, first);
}
@Override
protected void initViews() {
SetupWizardUtils.setImmersiveMode(this);
final View nextButton = findViewById(R.id.next_button);
if (nextButton != null) {
nextButton.setVisibility(View.GONE);
}
getNavigationBar().setNavigationBarListener(this);
getNavigationBar().getBackButton().setVisibility(View.GONE);
}
@Override
protected Button getNextButton() {
return getNavigationBar().getNextButton();
}
@Override
public void onNavigateBack() {
onBackPressed();
}
@Override
public void onNavigateNext() {
onNextButtonClick();
}
@Override
protected int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP;

31
src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
View File

@@ -20,17 +20,14 @@ import android.content.Intent;
import android.content.res.Resources;
import android.os.UserHandle;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.setupwizardlib.view.NavigationBar;
public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish
implements NavigationBar.NavigationBarListener {
public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish {
@Override
protected Intent getEnrollingIntent() {
@@ -51,16 +48,7 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish
@Override
protected void initViews() {
SetupWizardUtils.setImmersiveMode(this);
final View nextButton = findViewById(R.id.next_button);
if (nextButton != null) {
nextButton.setVisibility(View.GONE);
}
final NavigationBar navigationBar = getNavigationBar();
navigationBar.setNavigationBarListener(this);
navigationBar.getBackButton().setVisibility(View.GONE);
super.initViews();
final TextView message = (TextView) findViewById(R.id.message);
message.setText(R.string.setup_fingerprint_enroll_finish_message);
@@ -69,21 +57,6 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish
secondaryMessage.setVisibility(View.VISIBLE);
}
@Override
protected Button getNextButton() {
return getNavigationBar().getNextButton();
}
@Override
public void onNavigateBack() {
onBackPressed();
}
@Override
public void onNavigateNext() {
onNextButtonClick();
}
@Override
protected int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLL_FINISH_SETUP;

27
src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
View File

@@ -19,20 +19,17 @@ package com.android.settings.fingerprint;
import android.content.Intent;
import android.content.res.Resources;
import android.os.UserHandle;
import android.widget.Button;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.SetupChooseLockGeneric;
import com.android.settings.SetupWizardUtils;
import com.android.setupwizardlib.SetupWizardRecyclerLayout;
import com.android.setupwizardlib.GlifRecyclerLayout;
import com.android.setupwizardlib.items.Item;
import com.android.setupwizardlib.items.RecyclerItemAdapter;
import com.android.setupwizardlib.view.NavigationBar;
public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction
implements NavigationBar.NavigationBarListener {
public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
@Override
protected Intent getChooseLockIntent() {
@@ -56,8 +53,7 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
@Override
protected void initViews() {
final SetupWizardRecyclerLayout layout =
(SetupWizardRecyclerLayout) findViewById(R.id.setup_wizard_layout);
GlifRecyclerLayout layout = (GlifRecyclerLayout) getLayout();
final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
final Item nextItem = (Item) adapter.findItemById(R.id.next_button);
nextItem.setTitle(
@@ -67,13 +63,8 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
cancelItem.setTitle(
getText(R.string.security_settings_fingerprint_enroll_introduction_cancel_setup));
SetupWizardUtils.setImmersiveMode(this);
getNavigationBar().setNavigationBarListener(this);
Button nextButton = getNavigationBar().getNextButton();
nextButton.setText(null);
nextButton.setEnabled(false);
layout.setDividerInset(getResources().getDimensionPixelSize(
R.dimen.suw_items_icon_divider_inset));
R.dimen.suw_items_glif_icon_divider_inset));
}
@Override
@@ -97,16 +88,6 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
dialog.show(getFragmentManager());
}
@Override
public void onNavigateBack() {
onBackPressed();
}
@Override
public void onNavigateNext() {
// next is handled via the onNextButtonClick method in FingerprintEnrollIntroduction
}
@Override
protected int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLL_INTRO_SETUP;

12
src/com/android/settings/fingerprint/SetupSkipDialog.java
View File

@@ -22,17 +22,10 @@ import android.app.Dialog;
import android.app.DialogFragment;
import android.app.FragmentManager;
import android.content.DialogInterface;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import com.android.settings.R;
import com.android.setupwizardlib.util.SystemBarHelper;
public class SetupSkipDialog extends DialogFragment implements DialogInterface.OnClickListener {
@@ -52,10 +45,7 @@ public class SetupSkipDialog extends DialogFragment implements DialogInterface.O
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final AlertDialog dialog = onCreateDialogBuilder().create();
// hide system status bar.
SystemBarHelper.hideSystemBars(dialog);
return dialog;
return onCreateDialogBuilder().create();
}
@NonNull