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

Unverified Commit a541970b authored by Nick Reuter's avatar Nick Reuter Committed by Michael Bestas
Browse files

Settings: Promote external doze settings to first class 

 Retain original settings location if the
 aod migration flag is not enabled

Change-Id: Ieb8b8588967bab5b134a54c494d5f131fda49b99
parent 974aa764

res/xml/display_settings.xml

+8 −0
Original line number Diff line number Diff line
@@ -73,6 +73,14 @@ 
            settings:controller="com.android.settings.display.AmbientDisplayAlwaysOnPreferenceScreenController"

            settings:userRestriction="no_ambient_display" />



        <com.android.settingslib.PrimarySwitchPreference

            android:key="ambient_display_external_settings"

            android:title="@string/ambient_display_screen_title"

            android:summary="@string/doze_summary"

            settings:controller="com.android.settings.display.AmbientDisplaySettingsController">

            <intent android:action="org.lineageos.settings.device.DOZE_SETTINGS" />

        </com.android.settingslib.PrimarySwitchPreference>



        <com.android.settingslib.RestrictedPreference

            android:fragment="com.android.settings.display.FoldLockBehaviorSettings"

            android:key="fold_lock_behavior"

res/xml/security_lockscreen_settings.xml

+8 −0
Original line number Diff line number Diff line
@@ -131,6 +131,14 @@ 
            android:summary="@string/doze_summary"

            settings:controller="com.android.settings.display.AmbientDisplayNotificationsPreferenceController" />



        <com.android.settingslib.PrimarySwitchPreference

            android:key="doze_device_settings"

            android:title="@string/ambient_display_screen_title"

            android:summary="@string/doze_summary"

            settings:controller="com.android.settings.display.AmbientDisplaySettingsController">

            <intent android:action="org.lineageos.settings.device.DOZE_SETTINGS" />

        </com.android.settingslib.PrimarySwitchPreference>



    </PreferenceCategory>



    <!-- Work profile settings are at the bottom with high order value to avoid users thinking that

src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.preference.Preference; 


import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.display.AmbientDisplaySettingsController;



// LINT.IfChange

public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController {
@@ -51,6 +52,9 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference 


    @Override

    public int getAvailabilityStatus() {

        if (AmbientDisplaySettingsController.isExternallyManaged(mContext)) {

            return CONDITIONALLY_UNAVAILABLE;

        }

        return ambientAodMigration()

                && isAvailable(getConfig())

                && !SystemProperties.getBoolean(PROP_AWARE_AVAILABLE, false) ?

src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceScreen.kt

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.settings.R 
import com.android.settings.contract.KEY_AMBIENT_DISPLAY_ALWAYS_ON

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController.isAodSuppressedByBedtime

import com.android.settings.display.AmbientDisplaySettingsController

import com.android.settings.display.ambient.AmbientDisplayIllustration

import com.android.settings.display.ambient.AmbientDisplayMainSwitchPreference

import com.android.settings.display.ambient.AmbientDisplayStorage
@@ -104,6 +105,7 @@ open class AmbientDisplayAlwaysOnPreferenceScreen(context: Context) : 
    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)



    override fun isAvailable(context: Context): Boolean {

        if (AmbientDisplaySettingsController.isExternallyManaged(context)) return false

        if (!ambientAod()) return false

        return !SystemProperties.getBoolean(PROP_AWARE_AVAILABLE, false) &&

            AmbientDisplayConfiguration(context).alwaysOnAvailableForUser(UserHandle.myUserId())

src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import androidx.preference.Preference; 


import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.display.AmbientDisplaySettingsController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -80,6 +81,9 @@ public class AmbientDisplayNotificationsPreferenceController extends 


    @Override

    public int getAvailabilityStatus() {

        if (AmbientDisplaySettingsController.isExternallyManaged(mContext)) {

            return CONDITIONALLY_UNAVAILABLE;

        }

        return getAmbientConfig().pulseOnNotificationAvailable()

                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }