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

Commit c2d6e184 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9371302 from 674bb295 to tm-qpr2-release 

Change-Id: Ifedfd4c277a53a7eeac513ff832299d7ece506a1
parents be24d8b3 674bb295

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -13747,8 +13747,8 @@ 
    <string name="lockscreen_double_line_clock_summary">Show double-line clock when available</string>

    <!-- Lockscreen double-line clock toggle [CHAR LIMIT=60] -->

    <string name="lockscreen_double_line_clock_setting_toggle">Double-line clock</string>

    <!-- Lock screen buttons preference [CHAR LIMIT=60] -->

    <string name="lockscreen_quick_affordances_title">Buttons</string>

    <!-- Lock screen shortcuts preference [CHAR LIMIT=60] -->

    <string name="lockscreen_quick_affordances_title">Shortcuts</string>

    <!-- Summary for the lock screen button preference [CHAR LIMIT=60] -->

    <plurals name="lockscreen_quick_affordances_summary">

        <item quantity="zero">None</item>

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