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

Commit f39285a7 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Avoid media transcode can be bypass guard of developer options" into... 

Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev am: cb27771f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20608287



Change-Id: I541d2fd5f50812fbd675e7ba9466a15558bb6ef0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82dd9c34 cb27771f

src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.SystemProperties; 


import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller (on the transcode settings screen) indicating that by default we assume that apps
@@ -47,7 +48,11 @@ public class TranscodeDefaultOptionPreferenceController extends TogglePreference 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override

src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.SystemProperties; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller (in the Media transcoding settings) indicating the user's preference to disable
@@ -49,7 +50,11 @@ public class TranscodeDisableCachePreferenceController extends TogglePreferenceC 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override

src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.SystemProperties; 


import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller for the "Enabling transcoding for all apps" switch on the transcode settings
@@ -37,7 +38,11 @@ public class TranscodeGlobalTogglePreferenceController extends TogglePreferenceC 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override

src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.SystemProperties; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller (in the Media transcoding settings) indicating the user's preference to show
@@ -49,7 +50,11 @@ public class TranscodeNotificationPreferenceController extends TogglePreferenceC 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override

src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.SystemProperties; 


import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller for the User's control (over other transcoding preferences) preference switch on
@@ -47,7 +48,11 @@ public class TranscodeUserControlPreferenceController extends TogglePreferenceCo 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override