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

Commit 94bc9d4c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev

parents 60b63d54 546dd872

res/drawable/ic_lock_pin.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
    android:viewportHeight="24">

  <path

      android:pathData="M6,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM6,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM6,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM16,6c0,1.1 0.9,2 2,2s2,-0.9 2,-2 -0.9,-2 -2,-2 -2,0.9 -2,2zM12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"

      android:fillColor="?attr/sudListItemIconColor"/>

      android:fillColor="?android:attr/colorAccent"/>

</vector>

src/com/android/settings/password/SetupChooseLockGeneric.java

+9 −7
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_R 


import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.IBinder;

import android.os.UserHandle;
@@ -43,6 +42,7 @@ import com.android.settings.SetupWizardUtils; 
import com.android.settings.utils.SettingsDividerItemDecoration;



import com.google.android.setupdesign.GlifPreferenceLayout;

import com.google.android.setupdesign.util.ThemeHelper;



/**

 * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure
@@ -66,14 +66,10 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { 
        return SetupChooseLockGenericFragment.class;

    }



    @Override

    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {

        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());

        super.onApplyThemeResource(theme, new_resid, first);

    }



    @Override

    protected void onCreate(Bundle savedInstance) {

        setTheme(SetupWizardUtils.getTheme(this, getIntent()));

        ThemeHelper.trySetDynamicColor(this);

        super.onCreate(savedInstance);



        if(getIntent().hasExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY)) {
@@ -92,6 +88,12 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { 
        findViewById(R.id.content_parent).setFitsSystemWindows(false);

    }



    @Override

    protected boolean isToolbarEnabled() {

        // Hide the action bar from this page.

        return false;

    }



    public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment {



        public static final String EXTRA_PASSWORD_QUALITY = ":settings:password_quality";