Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2dda412 authored by Udam Saini's avatar Udam Saini Committed by Android (Google) Code Review
Browse files

Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev

parents e20deea7 71fde52a

src/com/android/settings/ChooseLockPassword.java

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public class ChooseLockPassword extends SettingsActivity { 
    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

    protected void onCreate(Bundle savedInstanceState) {

        // TODO: Fix on phones

        // Disable IME on our window since we provide our own keyboard

        //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,

src/com/android/settings/ChooseLockPattern.java

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class ChooseLockPattern extends SettingsActivity { 
    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

    protected void onCreate(Bundle savedInstanceState) {

        // requestWindowFeature(Window.FEATURE_NO_TITLE);

        super.onCreate(savedInstanceState);

        CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);

src/com/android/settings/SetupChooseLockGeneric.java

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 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;
@@ -66,6 +67,13 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { 
        super.onApplyThemeResource(theme, resid, first);

    }



    @Override

    protected void onCreate(Bundle savedInstance) {

        super.onCreate(savedInstance);

        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);

        layout.setFitsSystemWindows(false);

    }



    public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment

            implements NavigationBar.NavigationBarListener {

src/com/android/settings/SetupChooseLockPassword.java

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.os.Bundle; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.LinearLayout;



import com.android.setupwizardlib.SetupWizardLayout;

import com.android.setupwizardlib.util.SystemBarHelper;
@@ -77,6 +78,13 @@ public class SetupChooseLockPassword extends ChooseLockPassword { 
        return SetupChooseLockPasswordFragment.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());

src/com/android/settings/SetupChooseLockPattern.java

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 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;
@@ -72,6 +73,13 @@ 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());