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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-28 23:20:22 +00:00
committed by Android (Google) Code Review
parent d7bcf57ed8 083478ff01
commit aa3ae7291a
3 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -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>

18
res/xml/development_settings.xml
View File

@@ -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>

6
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -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;