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

Commit 7664abed authored by Han Wang's avatar Han Wang
Browse files

LineageParts: Remove obselete PreferenceCategory for LiveDisplay 

 * This avoids showing empty 'title' which looks ugly.

Change-Id: I34c655c94a26fc5907620fc9b82b84852fe741be
parent adc3442f

res/xml/livedisplay.xml

+32 −37
Original line number Original line Diff line number Diff line
@@ -19,9 +19,6 @@ 
        android:key="livedisplay"

        android:key="livedisplay"

        android:title="@*lineageos.platform:string/live_display_title">

        android:title="@*lineageos.platform:string/live_display_title">





    <PreferenceCategory

        android:key="live_display_options">



    <!-- Color profile -->

    <!-- Color profile -->

    <ListPreference

    <ListPreference

            android:key="live_display_color_profile"

            android:key="live_display_color_profile"
@@ -55,8 +52,6 @@ 
            android:defaultValue="false"

            android:defaultValue="false"

            android:persistent="false" />

            android:persistent="false" />





    </PreferenceCategory>



    <PreferenceCategory

    <PreferenceCategory

            android:key="advanced"

            android:key="advanced"

            android:title="@string/advanced">

            android:title="@string/advanced">

src/org/lineageos/lineageparts/livedisplay/LiveDisplaySettings.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import android.util.Log; 
import androidx.preference.ListPreference;

import androidx.preference.ListPreference;

import androidx.preference.Preference;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreference;





import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;
@@ -68,7 +69,8 @@ public class LiveDisplaySettings extends SettingsPreferenceFragment implements S 




    private static final String TAG = "LiveDisplay";

    private static final String TAG = "LiveDisplay";





    private static final String KEY_CATEGORY_LIVE_DISPLAY = "live_display_options";

    private static final String KEY_SCREEN_LIVE_DISPLAY = "livedisplay";



    private static final String KEY_CATEGORY_ADVANCED = "advanced";

    private static final String KEY_CATEGORY_ADVANCED = "advanced";





    private static final String KEY_LIVE_DISPLAY = "live_display";

    private static final String KEY_LIVE_DISPLAY = "live_display";
@@ -135,7 +137,8 @@ public class LiveDisplaySettings extends SettingsPreferenceFragment implements S 




        addPreferencesFromResource(R.xml.livedisplay);

        addPreferencesFromResource(R.xml.livedisplay);





        PreferenceCategory liveDisplayPrefs = findPreference(KEY_CATEGORY_LIVE_DISPLAY);

        PreferenceScreen liveDisplayPrefs = findPreference(KEY_SCREEN_LIVE_DISPLAY);



        PreferenceCategory advancedPrefs = findPreference(KEY_CATEGORY_ADVANCED);

        PreferenceCategory advancedPrefs = findPreference(KEY_CATEGORY_ADVANCED);





        int adaptiveMode = mLiveDisplayManager.getMode();

        int adaptiveMode = mLiveDisplayManager.getMode();