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

@@ -21,12 +21,12 @@ import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -37,6 +37,7 @@ import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockPatternView.DisplayMode;
import com.android.settings.notification.RedactionInterstitial;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.collect.Lists;
import java.util.ArrayList;
@@ -113,6 +114,8 @@ public class ChooseLockPattern extends SettingsActivity {
super.onCreate(savedInstanceState);
CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);
setTitle(msg);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false);
}
@Override
@@ -391,7 +394,10 @@ public class ChooseLockPattern extends SettingsActivity {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.choose_lock_pattern, container, false);
final GlifLayout layout = (GlifLayout) inflater.inflate(
R.layout.choose_lock_pattern, container, false);
layout.setHeaderText(getActivity().getTitle());
return layout;
}
@Override