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

Merge "Change to use setupcompat and setupdesign for suw pages"

Browse Source
This commit is contained in:
Pasty Chang
2018-12-13 01:48:58 +00:00
committed by Android (Google) Code Review
parent d6a40032c1 c1f8600d9f
commit 57baac2df5
53 changed files with 171 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -39,7 +39,8 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
import java.util.List;

5
src/com/android/settings/MasterClear.java
View File

@@ -64,8 +64,9 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.TemplateLayout;
import com.android.setupwizardlib.template.ButtonFooterMixin;
import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupdesign.template.ButtonFooterMixin;
import java.util.List;

5
src/com/android/settings/MasterClearConfirm.java
View File

@@ -43,8 +43,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.TemplateLayout;
import com.android.setupwizardlib.template.ButtonFooterMixin;
import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupdesign.template.ButtonFooterMixin;
/**
* Confirm and execute a reset of the device to a clean "just out of the box"

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

@@ -21,7 +21,9 @@ import android.os.SystemProperties;
import androidx.annotation.VisibleForTesting;
import com.android.setupwizardlib.util.WizardManagerHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.util.ThemeHelper;
public class SetupWizardUtils {
@@ -35,17 +37,17 @@ public class SetupWizardUtils {
}
if (theme != null) {
switch (theme) {
case WizardManagerHelper.THEME_GLIF_V3_LIGHT:
case ThemeHelper.THEME_GLIF_V3_LIGHT:
return R.style.GlifV3Theme_Light;
case WizardManagerHelper.THEME_GLIF_V3:
case ThemeHelper.THEME_GLIF_V3:
return R.style.GlifV3Theme;
case WizardManagerHelper.THEME_GLIF_V2_LIGHT:
case ThemeHelper.THEME_GLIF_V2_LIGHT:
return R.style.GlifV2Theme_Light;
case WizardManagerHelper.THEME_GLIF_V2:
case ThemeHelper.THEME_GLIF_V2:
return R.style.GlifV2Theme;
case WizardManagerHelper.THEME_GLIF_LIGHT:
case ThemeHelper.THEME_GLIF_LIGHT:
return R.style.GlifTheme_Light;
case WizardManagerHelper.THEME_GLIF:
case ThemeHelper.THEME_GLIF:
return R.style.GlifTheme;
}
}

3
src/com/android/settings/biometrics/BiometricEnrollBase.java
View File

@@ -32,7 +32,8 @@ import com.android.settings.SetupWizardUtils;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;
import com.android.settings.core.InstrumentedActivity;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
/**
* Base activity for all biometric enrollment steps.

3
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -28,7 +28,8 @@ import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.setupwizardlib.span.LinkSpan;
import com.google.android.setupdesign.span.LinkSpan;
/**
* Abstract base class for the intro onboarding activity for biometric enrollment.

3
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -29,7 +29,8 @@ import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.span.LinkSpan;
import com.google.android.setupdesign.span.LinkSpan;
public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {

3
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -32,7 +32,8 @@ import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.span.LinkSpan;
import com.google.android.setupdesign.span.LinkSpan;
public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {

3
src/com/android/settings/deviceinfo/StorageWizardBase.java
View File

@@ -44,7 +44,8 @@ import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settingslib.Utils;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
import java.text.NumberFormat;
import java.util.List;

3
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -68,7 +68,8 @@ import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.notification.RedactionInterstitial;
import com.android.settings.widget.ImeAwareEditText;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
import java.util.ArrayList;
import java.util.List;

2
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -48,9 +48,9 @@ import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.notification.RedactionInterstitial;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.collect.Lists;
import com.google.android.setupdesign.GlifLayout;
import java.util.ArrayList;
import java.util.Collections;

3
src/com/android/settings/password/ChooseLockSettingsHelper.java
View File

@@ -31,7 +31,8 @@ import androidx.fragment.app.Fragment;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.setupwizardlib.util.WizardManagerHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
public final class ChooseLockSettingsHelper {

3
src/com/android/settings/password/ChooseLockTypeDialogFragment.java
View File

@@ -39,7 +39,8 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.setupwizardlib.util.WizardManagerHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
import java.util.List;

3
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -38,7 +38,8 @@ import com.android.settings.SetupEncryptionInterstitial;
import com.android.settings.SetupWizardUtils;
import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
import com.android.settings.utils.SettingsDividerItemDecoration;
import com.android.setupwizardlib.GlifPreferenceLayout;
import com.google.android.setupdesign.GlifPreferenceLayout;
/**
* Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure

2
src/com/android/settings/utils/SettingsDividerItemDecoration.java
View File

@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
import com.android.setupwizardlib.DividerItemDecoration;
import com.google.android.setupdesign.DividerItemDecoration;
public class SettingsDividerItemDecoration extends DividerItemDecoration {

3
src/com/android/settings/wifi/WifiDialogActivity.java
View File

@@ -30,7 +30,8 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.SetupWizardUtils;
import com.android.settingslib.wifi.AccessPoint;
import com.android.setupwizardlib.util.WizardManagerHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener,
DialogInterface.OnDismissListener {