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

Commit ab68a810 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Establish permanently unavailable settings" into pi-dev

parents 26453818 bd376296

src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Context; 
import android.provider.Settings;

import android.view.accessibility.AccessibilityManager;



import com.android.settings.accessibility.AccessibilitySettings;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.accessibility.AccessibilityUtils;
@@ -88,7 +87,7 @@ public class AccessibilitySlicePreferenceController extends TogglePreferenceCont 
    @Override

    public int getAvailabilityStatus() {

        // Return unsupported when the service is disabled or not installed.

        return getAccessibilityServiceInfo() == null ? DISABLED_UNSUPPORTED : AVAILABLE;

        return getAccessibilityServiceInfo() == null ? UNSUPPORTED_ON_DEVICE : AVAILABLE;

    }



    private AccessibilityServiceInfo getAccessibilityServiceInfo() {

src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class MagnificationNavbarPreferenceController extends BasePreferenceContr 
    public int getAvailabilityStatus() {

        return MagnificationPreferenceFragment.isApplicable(mContext.getResources())

                ? AVAILABLE

                : DISABLED_UNSUPPORTED;

                : UNSUPPORTED_ON_DEVICE;

    }



    @Override

src/com/android/settings/applications/DataSaverController.java

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ public class DataSaverController extends BasePreferenceController { 
    public int getAvailabilityStatus() {

        return mContext.getResources().getBoolean(R.bool.config_show_data_saver)

                ? AVAILABLE

                : DISABLED_UNSUPPORTED;

                : UNSUPPORTED_ON_DEVICE;

    }

}
 
 No newline at end of file

src/com/android/settings/applications/DeviceAdministratorsController.java

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ public class DeviceAdministratorsController extends BasePreferenceController { 
    public int getAvailabilityStatus() {

        return mContext.getResources().getBoolean(R.bool.config_show_device_administrators)

                ? AVAILABLE

                : DISABLED_UNSUPPORTED;

                : UNSUPPORTED_ON_DEVICE;

    }

}
 
 No newline at end of file

src/com/android/settings/applications/EnabledVrListenersController.java

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ public class EnabledVrListenersController extends BasePreferenceController { 
    public int getAvailabilityStatus() {

        return mContext.getResources().getBoolean(R.bool.config_show_enabled_vr_listeners)

                ? AVAILABLE

                : DISABLED_UNSUPPORTED;

                : UNSUPPORTED_ON_DEVICE;

    }

}
 
 No newline at end of file