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

Commit 676a1990 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7526818 from a415ecb6 to sc-d1-release 

Change-Id: I8331aa70cd28f8a64a39f55aab3fe2929d787954
parents e619eded a415ecb6

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -2966,6 +2966,10 @@ 
            </intent-filter>

        </activity>



        <!--

            The Wi-Fi result data will only be returned from WifiDialogActivity if the calling

            package has ACCESS_COARSE_LOCATION or ACCESS_FINE_LOCATION permission. (see b/185126813)

        -->

        <activity

            android:name=".wifi.WifiDialogActivity"

            android:label=""

res/values/themes_suw.xml

+18 −0
Original line number Diff line number Diff line
@@ -223,6 +223,24 @@ 
    <!-- This theme was applied to Settings pages which are running under SUW. -->

    <style name="SubSettings.SetupWizard" parent="SudThemeGlifV3.Light" />



    <!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->

    <style name="SudDynamicColorThemeSettings.SetupWizard" parent="SudDynamicColorThemeGlifV3.Light">

        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>

        <item name="android:listPreferredItemPaddingStart">24dp</item>

        <item name="android:listPreferredItemPaddingEnd">16dp</item>

        <item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>

        <item name="android:switchStyle">@style/Switch.SettingsLib</item>

    </style>



    <!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->

    <style name="SudDynamicColorThemeSettings.SetupWizard.DayNight" parent="SudDynamicColorThemeGlifV3.DayNight">

        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>

        <item name="android:listPreferredItemPaddingStart">24dp</item>

        <item name="android:listPreferredItemPaddingEnd">16dp</item>

        <item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>

        <item name="android:switchStyle">@style/Switch.SettingsLib</item>

    </style>



    <!-- DayNight themes -->

    <style name="GlifTheme.DayNight" parent="GlifTheme.Light" />

    <style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />

res/xml/accessibility_button_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 


    <com.android.settings.accessibility.AccessibilityFooterPreference

        android:key="accessibility_button_footer"

        android:title="@string/accessibility_button_description"

        android:persistent="false"

        android:selectable="false"

        settings:searchable="false"

src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java

+13 −4
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.settings.accessibility; 


import android.content.Context;



import androidx.preference.PreferenceScreen;



import com.android.settings.R;



/**
@@ -36,9 +38,16 @@ public class AccessibilityButtonFooterPreferenceController extends 
    }



    @Override

    public CharSequence getSummary() {

        return AccessibilityUtil.isGestureNavigateEnabled(mContext)

                ? mContext.getString(R.string.accessibility_button_gesture_description)

                : mContext.getString(R.string.accessibility_button_description);

    public void displayPreference(PreferenceScreen screen) {

        // Need to update footerPreference's data before super.displayPreference(), then it will use

        // data to update related property of footerPreference.

        if (AccessibilityUtil.isGestureNavigateEnabled(mContext)) {

            final AccessibilityFooterPreference footerPreference =

                    screen.findPreference(getPreferenceKey());

            footerPreference.setTitle(

                    mContext.getString(R.string.accessibility_button_gesture_description));

        }



        super.displayPreference(screen);

    }

}

src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java

+12 −2
Original line number Diff line number Diff line
@@ -101,12 +101,22 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit 
    @Override

    protected void onCreate(Bundle savedState) {

        super.onCreate(savedState);

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

        ThemeHelper.trySetDynamicColor(this);

        applyTheme();

        tryLaunchFontSizeSettings();

        findViewById(R.id.content_parent).setFitsSystemWindows(false);

    }



    private void applyTheme() {

        if (ThemeHelper.trySetDynamicColor(this)) {

            final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)

                    ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight

                    : R.style.SudDynamicColorThemeSettings_SetupWizard;

            setTheme(appliedTheme);

        } else {

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

        }

    }



    @VisibleForTesting

    void tryLaunchFontSizeSettings() {

        if (WizardManagerHelper.isAnySetupWizard(getIntent())