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

Commit 44d3605d authored by Amin Shaikh's avatar Amin Shaikh Committed by android-build-merger
Browse files

Merge "Remove theming developer settings." into qt-r1-dev 

am: aa3ae729

Change-Id: I71a45b7789a064d52c46c93439dda6057e5affc1
parents e6680fc5 aa3ae729

res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -9984,12 +9984,6 @@ 








    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the settings category for theme overlays. -->









    <string name="theme_customization_category">Theming</string>









    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize accent color. -->









    <string name="theme_customization_accent_color_title">Accent color</string>









    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize headline and body fonts. -->









    <string name="theme_customization_font_title">Headline / Body font</string>









    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize the adaptive icon shape (e.g. launcher and quick settings icons). -->









    <string name="theme_customization_icon_shape_title">Icon shape</string>









    <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off customizations for a given category.-->









    <string name="theme_customization_device_default">Device default</string>

































res/xml/development_settings.xml



+1
−17






























Original line number
Diff line number
Diff line







@@ -576,7 +576,7 @@







    <com.android.settings.development.autofill.AutofillPreferenceCategory









        android:key="debug_autofill_category"









        android:title="@string/debug_autofill_category"









        android:order="1100">









        android:order="1100"> <!-- Incremented by 100 from last order (i.e. 1000) -->



















        <ListPreference









            android:key="autofill_logging_level"








@@ -597,20 +597,4 @@







            android:title="@string/autofill_reset_developer_options" />



















    </com.android.settings.development.autofill.AutofillPreferenceCategory>



















    <PreferenceCategory









        android:key="theme_customization_category"









        android:title="@string/theme_customization_category"









        android:order="1200"> <!-- Incremented by 100 from last order (i.e. 1100) -->



















        <ListPreference









            android:key="android.theme.customization.accent_color"









            android:title="@string/theme_customization_accent_color_title"/>









        <ListPreference









            android:key="android.theme.customization.font"









            android:title="@string/theme_customization_font_title"/>









        <ListPreference









            android:key="android.theme.customization.adaptive_icon_shape"









            android:title="@string/theme_customization_icon_shape_title"/>









    </PreferenceCategory>









</PreferenceScreen>
























src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+0
−6






























Original line number
Diff line number
Diff line







@@ -495,12 +495,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra







        controllers.add(new DefaultLaunchPreferenceController(context, "inactive_apps"));









        controllers.add(new AutofillLoggingLevelPreferenceController(context, lifecycle));









        controllers.add(new AutofillResetOptionsPreferenceController(context));









        controllers.add(new OverlayCategoryPreferenceController(context,









                "android.theme.customization.accent_color"));









        controllers.add(new OverlayCategoryPreferenceController(context,









                "android.theme.customization.font"));









        controllers.add(new OverlayCategoryPreferenceController(context,









                "android.theme.customization.adaptive_icon_shape"));









        controllers.add(new TrustAgentsExtendUnlockPreferenceController(context));









        controllers.add(new TrustLostLocksScreenPreferenceController(context));









        return controllers;