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

Commit 7b53f9e6 authored by Bruno Martins's avatar Bruno Martins
Browse files

Parts: Ditch Styles in favour of ThemePicker 

Change-Id: I98ba26dcddc98cd50422cd47e24a8774643e6ddb
parent 12cc7760

AndroidManifest.xml

+0 −22
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
    <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />

    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />



    <uses-permission android:name="lineageos.permission.MANAGE_REMOTE_PREFERENCES" />
@@ -190,27 +189,6 @@ 
                android:resource="@string/summary_empty" />

        </activity-alias>



        <!-- Style settings (Display category) -->

        <activity-alias

            android:name=".style.StylePreferences"

            android:label="@string/style_title"

            android:targetActivity="PartsActivity">

            <intent-filter>

                <action android:name="com.android.settings.action.IA_SETTINGS" />

                <action android:name="org.lineageos.lineageparts.STYLE_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data

                android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.display" />

            <meta-data

                android:name="com.android.settings.order"

                android:value="3" />

            <meta-data

                android:name="com.android.settings.summary"

                android:resource="@string/style_summary" />

        </activity-alias>



        <!-- Trust interface (Privacy category) -->

        <activity-alias

            android:name=".trust.TrustPreferences"

res/values/arrays.xml

+0 −26
Original line number Diff line number Diff line
@@ -432,32 +432,6 @@ 
        <item>3</item>

    </string-array>



    <string-array name="style_entries" translatable="false">

        <item>@string/style_global_entry_automatic</item>

        <item>@string/style_global_entry_time</item>

        <item>@string/style_global_entry_light</item>

        <item>@string/style_global_entry_dark</item>

    </string-array>



    <!-- Global style values -->

    <string-array name="style_values" translatable="false">

        <item>0</item> <!-- Based on wallpaper -->

        <item>1</item> <!-- Based on LiveDisplay -->

        <item>2</item> <!-- Force light -->

        <item>3</item> <!-- Force dark -->

    </string-array>



    <string-array name="dark_overlay_entries" translatable="false">

        <item>@string/style_dark_overlay_default</item>

        <item>@string/style_dark_overlay_black</item>

    </string-array>



    <!-- These should be updated accordingly to the sdk -->

    <string-array name="dark_overlay_values" translatable="false">

        <item>org.lineageos.overlay.dark</item>

        <item>org.lineageos.overlay.black</item>

    </string-array>



    <!-- Sms limit -->

    <string-array name="sms_security_check_limit_entries" translatable="false">

        <item>@string/sms_security_check_limit_always_confirm</item>

res/values/strings.xml

+0 −22
Original line number Diff line number Diff line
@@ -665,28 +665,6 @@ 
    <!-- Egg: Title for the easter egg activity -->

    <string name="egg_title" translatable="false">LineageOS Easter Egg</string>



    <!-- Berry Lite -->

    <string name="style_title">Style</string>

    <string name="style_summary">Choose system colors</string>

    <string name="style_global_title">Style</string>

    <string name="style_global_entry_automatic">Automatic (wallpaper)</string>

    <string name="style_global_entry_light">Light</string>

    <string name="style_global_entry_dark">Dark</string>

    <string name="style_global_entry_time">Automatic (time of the day)</string>

    <string name="style_global_entry_app">Managed by %1$s</string>

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

    <string name="style_accent_configuration_not_supported">The current accent isn\'t compatible with the selected style. In order to proceed another accent has to be selected, do you want to continue?</string>

    <string name="style_accent_configuration_positive">Proceed</string>

    <string name="style_automagic_title">Automagic</string>

    <string name="style_automagic_description">Tune the style to match your wallpaper</string>

    <string name="style_automagic_dialog_content">Suggested style: <b>%1$s</b> with <b>%2$s</b> accent.\nDo you want to apply it?</string>

    <string name="style_automagic_dialog_positive">Apply</string>

    <string name="style_accent_default_name">Default</string>

    <string name="style_dark_overlay_title">Dark mode</string>

    <string name="style_dark_overlay_default">Default</string>

    <string name="style_dark_overlay_black">Black</string>

    <string name="style_permission_error">Storage access permission is needed to analyze your wallpaper, please grant it to use this feature</string>



    <!-- Trust interface -->

    <string name="trust_title" translatable="false">@*lineageos.platform:string/trust_feature_name</string>

    <string name="trust_category_features">Status</string>

res/xml/parts_catalog.xml

+0 −6
Original line number Diff line number Diff line
@@ -114,12 +114,6 @@ 
          android:fragment="org.lineageos.lineageparts.gestures.TouchscreenGestureSettings"

          lineage:xmlRes="@xml/touchscreen_gesture_settings" />



    <part android:key="style"

          android:title="@string/style_title"

          android:summary="@string/style_summary"

          android:fragment="org.lineageos.lineageparts.style.StylePreferences"

          lineage:xmlRes="@xml/style_preferences" />



    <part android:key="trust_interface"

          android:title="@string/trust_title"

          android:fragment="org.lineageos.lineageparts.trust.TrustPreferences"

res/xml/style_preferences.xml

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2018 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">



    <lineageos.preference.LineageSystemSettingListPreference

        android:defaultValue="0"

        android:entries="@array/style_entries"

        android:entryValues="@array/style_values"

        android:key="berry_global_style"

        android:summary="%s"

        android:icon="@drawable/ic_style_auto"

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



    <Preference

        android:key="style_accent"

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



    <lineageos.preference.LineageSystemSettingListPreference

        android:defaultValue="org.lineageos.overlay.dark"

        android:entries="@array/dark_overlay_entries"

        android:entryValues="@array/dark_overlay_values"

        android:key="berry_dark_overlay"

        android:summary="%s"

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



    <Preference

        android:key="style_automagic"

        android:icon="@drawable/ic_automagic"

        android:summary="@string/style_automagic_description"

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



</PreferenceScreen>