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

Commit 9990f397 authored by Maurice Lam's avatar Maurice Lam
Browse files

Read theme for lock screen flows 

Move the applyThemeResource calls up from the setup wizard specific
subclasses up to the settings classes so that it will get GLIF v2
theme on devices that request it.

Test: Manual
Bug: 62906814
Change-Id: I6ff4ff8d9ed3e6090b35b4ae7197e5d01f5a61f8
parent a6b24388

src/com/android/settings/EncryptionInterstitial.java

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.app.admin.DevicePolicyManager; 
import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.res.Resources;

import android.os.Bundle;

import android.util.Log;

import android.view.LayoutInflater;
@@ -56,6 +57,12 @@ public class EncryptionInterstitial extends SettingsActivity { 
        return modIntent;

    }



    @Override

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

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }



    @Override

    protected boolean isValidFragment(String fragmentName) {

        return EncryptionInterstitialFragment.class.getName().equals(fragmentName);

src/com/android/settings/SetupEncryptionInterstitial.java

+0 −7
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings; 


import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.os.Bundle;

import android.widget.LinearLayout;
@@ -54,12 +53,6 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial { 
        return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);

    }



    @Override

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

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }



    @Override

    protected void onCreate(Bundle savedInstance) {

        super.onCreate(savedInstance);

src/com/android/settings/SetupRedactionInterstitial.java

+0 −6
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ public class SetupRedactionInterstitial extends RedactionInterstitial { 
        return SetupRedactionInterstitialFragment.class.getName().equals(fragmentName);

    }



    @Override

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

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }



    public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment {



        // Setup wizard specific UI customizations can be done here

src/com/android/settings/fingerprint/FingerprintEnrollBase.java

+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.fingerprint; 


import android.annotation.Nullable;

import android.content.Intent;

import android.content.res.Resources;

import android.graphics.Color;

import android.os.Bundle;

import android.os.UserHandle;
@@ -27,6 +28,7 @@ import android.widget.Button; 
import android.widget.TextView;



import com.android.settings.R;

import com.android.settings.SetupWizardUtils;

import com.android.settings.core.InstrumentedActivity;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.setupwizardlib.GlifLayout;
@@ -56,6 +58,12 @@ public abstract class FingerprintEnrollBase extends InstrumentedActivity 
        mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());

    }



    @Override

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

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }



    @Override

    protected void onSaveInstanceState(Bundle outState) {

        super.onSaveInstanceState(outState);

src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java

+0 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settings.fingerprint;



import android.content.Intent;

import android.content.res.Resources;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.SetupWizardUtils;
@@ -31,12 +30,6 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling 
        return intent;

    }



    @Override

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

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }



    @Override

    public int getMetricsCategory() {

        return MetricsEvent.FINGERPRINT_ENROLLING_SETUP;