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

Commit 1bb84f98 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Android (Google) Code Review
Browse files

Merge "Enable use_resource_processor for all sysui deps" into main

parents af773270 80e914a2

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class FlashNotificationsPreviewPreference extends Preference { 
    private void init() {

        setLayoutResource(R.layout.flash_notification_preview_preference);

        mBackgroundEnabled = getContext().getDrawable(

                com.android.settingslib.widget.R.drawable.settingslib_switch_bar_bg_on);

                com.android.settingslib.widget.mainswitch.R.drawable.settingslib_switch_bar_bg_on);

        mBackgroundDisabled = getContext().getDrawable(R.drawable.switch_bar_bg_disabled);

        mTextColorDisabled = Utils.getColorAttrDefaultColor(getContext(),

                android.R.attr.textColorPrimary);

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

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class VibrationSettings extends DashboardFragment { 
                R.integer.config_vibration_supported_intensity_levels);

        if (rv != null && supportedIntensities > 1) {

            final int bottom_padding = res.getDimensionPixelSize(

                    com.android.settingslib.widget.R.dimen.settingslib_listPreferredItemPaddingEnd);

                    com.android.settingslib.widget.theme.R.dimen.settingslib_listPreferredItemPaddingEnd);

            rv.setPaddingRelative(rv.getPaddingStart(), rv.getPaddingTop(), rv.getPaddingEnd(),

                    rv.getPaddingBottom() + bottom_padding);

        }

src/com/android/settings/accounts/AccountTypePreferenceLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class AccountTypePreferenceLoader { 
                            desc.packageName, 0, mUserHandle);

                    final Theme baseTheme = mFragment.getResources().newTheme();

                    baseTheme.applyStyle(

                            com.android.settingslib.widget.R.style.Theme_SettingsBase, true);

                            com.android.settingslib.widget.theme.R.style.Theme_SettingsBase, true);

                    final Context themedCtx =

                            new LocalClassLoaderContextThemeWrapper(getClass(), targetCtx, 0);

                    themedCtx.getTheme().setTo(baseTheme);

src/com/android/settings/applications/appcompat/RadioWithImagePreference.java

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ public class RadioWithImagePreference extends CheckBoxPreference { 
    }



    private void init() {

        setWidgetLayoutResource(R.layout.preference_widget_radiobutton);

        setWidgetLayoutResource(

                com.android.settingslib.widget.preference.radio.R.layout.preference_widget_radiobutton);

        setLayoutResource(R.layout.radio_with_image_preference);

        setIconSpaceReserved(false);

    }

src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class ExternalSourcesDetails extends AppInfoWithHeader 
                        UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,

                        userHandle);

        if ((userRestrictionSource & UserManager.RESTRICTION_SOURCE_SYSTEM) != 0) {

            return context.getString(com.android.settingslib.widget.R.string.disabled_by_admin);

            return context.getString(com.android.settingslib.widget.restricted.R.string.disabled_by_admin);

        } else if (userRestrictionSource != 0) {

            return context.getString(com.android.settingslib.R.string.disabled);

        }