Use GLIF theme for Settings > Security > Screen lock

Bug: 24405946
Change-Id: I1fed96cbc228b6bb367637f83f9cd3bac2761417
This commit is contained in:
Maurice Lam
2016-06-15 13:39:34 -07:00
parent 0a13cfbf8e
commit d189ac52a4
26 changed files with 345 additions and 1140 deletions

View File

@@ -20,14 +20,7 @@ import android.app.Fragment;
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.LinearLayout;
import com.android.setupwizardlib.GlifLayout;
/**
* Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
@@ -70,13 +63,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
return SetupChooseLockPatternFragment.class;
}
@Override
protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false);
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
@@ -85,15 +71,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final GlifLayout layout = (GlifLayout) inflater.inflate(
R.layout.setup_choose_lock_pattern, container, false);
layout.setHeaderText(getActivity().getTitle());
return layout;
}
@Override
protected Intent getRedactionInterstitialIntent(Context context) {
return null;