PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support GLIF v3 for lock screen settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-02 20:12:43 +00:00
committed by Android (Google) Code Review
parent 1297029728 f5b42777c1
commit 4d869f2859
6 changed files with 182 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/SetupWizardUtils.java
View File

@@ -34,6 +34,10 @@ public class SetupWizardUtils {
}
if (theme != null) {
switch (theme) {
case WizardManagerHelper.THEME_GLIF_V3_LIGHT:
return R.style.GlifV3Theme_Light;
case WizardManagerHelper.THEME_GLIF_V3:
return R.style.GlifV3Theme;
case WizardManagerHelper.THEME_GLIF_V2_LIGHT:
return R.style.GlifV2Theme_Light;
case WizardManagerHelper.THEME_GLIF_V2:
@@ -50,7 +54,11 @@ public class SetupWizardUtils {
public static int getTransparentTheme(Intent intent) {
final int suwTheme = getTheme(intent);
int wifiDialogTheme = R.style.GlifV2Theme_Light_Transparent;
if (suwTheme == R.style.GlifV2Theme) {
if (suwTheme == R.style.GlifV3Theme) {
wifiDialogTheme = R.style.GlifV3Theme_Transparent;
} else if (suwTheme == R.style.GlifV3Theme_Light) {
wifiDialogTheme = R.style.GlifV3Theme_Light_Transparent;
} else if (suwTheme == R.style.GlifV2Theme) {
wifiDialogTheme = R.style.GlifV2Theme_Transparent;
} else if (suwTheme == R.style.GlifTheme_Light) {
wifiDialogTheme = R.style.SetupWizardTheme_Light_Transparent;

1
src/com/android/settings/fingerprint/FingerprintEnrollBase.java
View File

@@ -48,7 +48,6 @@ public abstract class FingerprintEnrollBase extends InstrumentedActivity
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTheme(R.style.Theme_FingerprintEnroll);
mToken = getIntent().getByteArrayExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
if (savedInstanceState != null && mToken == null) {