Use value-night to give theme instead of directly from intent extra when Setup day/nNight mode enabled and in Setup flow Before: <vision settings> https://hsv.googleplex.com/4837266235064320 <wifi dialog> https://hsv.googleplex.com/5687053981319168 <lock screen with disabling button> https://hsv.googleplex.com/4843506419892224 <lock screen with enabling button> https://hsv.googleplex.com/5650348922372096 <fingerprint intro> https://hsv.googleplex.com/5133769046491136 <fingerprint touch> https://hsv.googleplex.com/5681937198874624 <fingerprint left touch> https://hsv.googleplex.com/5767441676238848 <squeeze release> https://hsv.googleplex.com/6632476812247040 After: <vision settings> https://hsv.googleplex.com/6213298875793408 <wifi dialog> https://hsv.googleplex.com/6025790804197376 <lock screen with disabling button> https://hsv.googleplex.com/5747461219942400 <lock screen with enabling button> https://hsv.googleplex.com/5766700781797376 <fingerprint intro> https://hsv.googleplex.com/6751334529236992 <fingerprint touch> https://hsv.googleplex.com/5625963293442048 <fingerprint left touch> https://hsv.googleplex.com/4518139360444416 <squeeze release> https://hsv.googleplex.com/5220720579706880 Bug: 169734655 Test: robo test Change-Id: I4aab843e28a932c7b823f36f1d8df1e5b2341f4e
138 lines
5.8 KiB
Java
138 lines
5.8 KiB
Java
/*
|
|
* Copyright (C) 2014 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License
|
|
*/
|
|
|
|
package com.android.settings;
|
|
|
|
import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_FIRST_RUN;
|
|
import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_SETUP_FLOW;
|
|
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.os.Bundle;
|
|
import android.sysprop.SetupWizardProperties;
|
|
|
|
import com.google.android.setupcompat.util.WizardManagerHelper;
|
|
import com.google.android.setupdesign.util.ThemeHelper;
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
|
public class SetupWizardUtils {
|
|
|
|
public static String getThemeString(Intent intent) {
|
|
String theme = intent.getStringExtra(WizardManagerHelper.EXTRA_THEME);
|
|
if (theme == null) {
|
|
theme = SetupWizardProperties.theme().orElse("");
|
|
}
|
|
return theme;
|
|
}
|
|
|
|
public static int getTheme(Context context, Intent intent) {
|
|
String theme = getThemeString(intent);
|
|
// TODO(yukl): Move to ThemeResolver and add any additional required attributes in
|
|
// onApplyThemeResource using Theme overlays
|
|
if (theme != null) {
|
|
if (WizardManagerHelper.isAnySetupWizard(intent)) {
|
|
if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
|
|
switch (theme) {
|
|
case ThemeHelper.THEME_GLIF_V3_LIGHT:
|
|
case ThemeHelper.THEME_GLIF_V3:
|
|
return R.style.GlifV3Theme_DayNight;
|
|
case ThemeHelper.THEME_GLIF_V2_LIGHT:
|
|
case ThemeHelper.THEME_GLIF_V2:
|
|
return R.style.GlifV2Theme_DayNight;
|
|
case ThemeHelper.THEME_GLIF_LIGHT:
|
|
case ThemeHelper.THEME_GLIF:
|
|
return R.style.GlifTheme_DayNight;
|
|
}
|
|
} else {
|
|
switch (theme) {
|
|
case ThemeHelper.THEME_GLIF_V3_LIGHT:
|
|
return R.style.GlifV3Theme_Light;
|
|
case ThemeHelper.THEME_GLIF_V3:
|
|
return R.style.GlifV3Theme;
|
|
case ThemeHelper.THEME_GLIF_V2_LIGHT:
|
|
return R.style.GlifV2Theme_Light;
|
|
case ThemeHelper.THEME_GLIF_V2:
|
|
return R.style.GlifV2Theme;
|
|
case ThemeHelper.THEME_GLIF_LIGHT:
|
|
return R.style.GlifTheme_Light;
|
|
case ThemeHelper.THEME_GLIF:
|
|
return R.style.GlifTheme;
|
|
}
|
|
}
|
|
} else {
|
|
switch (theme) {
|
|
case ThemeHelper.THEME_GLIF_V3_LIGHT:
|
|
case ThemeHelper.THEME_GLIF_V3:
|
|
return R.style.GlifV3Theme;
|
|
case ThemeHelper.THEME_GLIF_V2_LIGHT:
|
|
case ThemeHelper.THEME_GLIF_V2:
|
|
return R.style.GlifV2Theme;
|
|
case ThemeHelper.THEME_GLIF_LIGHT:
|
|
case ThemeHelper.THEME_GLIF:
|
|
return R.style.GlifTheme;
|
|
}
|
|
}
|
|
}
|
|
return R.style.GlifTheme;
|
|
}
|
|
|
|
public static int getTransparentTheme(Context context, Intent intent) {
|
|
int transparentTheme;
|
|
final int suwTheme = getTheme(context, intent);
|
|
if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
|
|
transparentTheme = R.style.GlifV2Theme_DayNight_Transparent;
|
|
} else {
|
|
transparentTheme = R.style.GlifV2Theme_Light_Transparent;
|
|
}
|
|
if (suwTheme == R.style.GlifV3Theme_DayNight) {
|
|
transparentTheme = R.style.GlifV3Theme_DayNight_Transparent;
|
|
} else if (suwTheme == R.style.GlifV3Theme_Light) {
|
|
transparentTheme = R.style.GlifV3Theme_Light_Transparent;
|
|
} else if (suwTheme == R.style.GlifV2Theme_DayNight) {
|
|
transparentTheme = R.style.GlifV2Theme_DayNight_Transparent;
|
|
} else if (suwTheme == R.style.GlifV2Theme_Light) {
|
|
transparentTheme = R.style.GlifV2Theme_Light_Transparent;
|
|
} else if (suwTheme == R.style.GlifTheme_DayNight) {
|
|
transparentTheme = R.style.SetupWizardTheme_DayNight_Transparent;
|
|
} else if (suwTheme == R.style.GlifTheme_Light) {
|
|
transparentTheme = R.style.SetupWizardTheme_Light_Transparent;
|
|
} else if (suwTheme == R.style.GlifV3Theme) {
|
|
transparentTheme = R.style.GlifV3Theme_Transparent;
|
|
} else if (suwTheme == R.style.GlifV2Theme) {
|
|
transparentTheme = R.style.GlifV2Theme_Transparent;
|
|
} else if (suwTheme == R.style.GlifTheme) {
|
|
transparentTheme = R.style.SetupWizardTheme_Transparent;
|
|
}
|
|
return transparentTheme;
|
|
}
|
|
|
|
public static void copySetupExtras(Intent fromIntent, Intent toIntent) {
|
|
WizardManagerHelper.copyWizardManagerExtras(fromIntent, toIntent);
|
|
}
|
|
|
|
public static Bundle copyLifecycleExtra(Bundle srcBundle, Bundle dstBundle) {
|
|
for (String key :
|
|
Arrays.asList(
|
|
EXTRA_IS_FIRST_RUN,
|
|
EXTRA_IS_SETUP_FLOW)) {
|
|
dstBundle.putBoolean(key, srcBundle.getBoolean(key, false));
|
|
}
|
|
return dstBundle;
|
|
}
|
|
}
|