Merge "Use new naming for Widevine Developer option." into main (be7215cc) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -13179,4 +13179,11 @@

		<!--Text for Stylus Pointer Icon preference -->
		<string name="show_stylus_pointer_icon">Show pointer while hovering</string>

		<!-- Developer settings title: Media DRM settings screen. [CHAR LIMIT=50] -->
		<string name="media_drm_settings_title">Media DRM settings</string>
		<!-- Developer settings title: select whether to enable force Software Secure Crypto fallback. [CHAR LIMIT=50] -->
		<string name="force_swcrypto_fallback_title">Force Software Secure Crypto</string>
		<!-- Developer settings summary: select to force Software Secure Crypto.[CHAR LIMIT=NONE] -->
		<string name="force_swcrypto_fallback_summary">Force DRM key management to use software-based whitebox crypto</string>
		</resources>

+3 −3

Original line number	Diff line number	Diff line
		@@ -646,9 +646,9 @@
		android:fragment="com.android.settings.development.transcode.TranscodeSettingsFragment" />

		<Preference
		android:key="widevine_settings"
		android:title="@string/widevine_settings_title"
		android:fragment="com.android.settings.development.widevine.WidevineSettingsFragment" />
		android:key="media_drm_settings"
		android:title="@string/media_drm_settings_title"
		android:fragment="com.android.settings.development.mediadrm.MediaDrmSettingsFragment" />

		</PreferenceCategory>

+5 −5

Original line number	Diff line number	Diff line
		@@ -18,12 +18,12 @@
		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:title="@string/widevine_settings_title"
		android:title="@string/media_drm_settings_title"
		settings:searchable="false">

		<SwitchPreferenceCompat
		android:key="force_l3_fallback"
		android:title="@string/force_l3_fallback_title"
		android:summary="@string/force_l3_fallback_summary"
		settings:controller="com.android.settings.development.widevine.ForceL3FallbackPreferenceController" />
		android:key="force_swcrypto_fallback"
		android:title="@string/force_swcrypto_fallback_title"
		android:summary="@string/force_swcrypto_fallback_summary"
		settings:controller="com.android.settings.development.mediadrm.ForceSwSecureCryptoFallbackPreferenceController" />
		</PreferenceScreen>
		No newline at end of file

+6 −6

Original line number	Diff line number	Diff line
		@@ -14,9 +14,10 @@
		* limitations under the License.
		*/

		package com.android.settings.development.widevine;
		package com.android.settings.development.mediadrm;

		import android.content.Context;
		import android.media.MediaDrm;
		import android.sysprop.WidevineProperties;
		import android.util.Log;

		@@ -29,13 +30,12 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler;
		import com.android.settings.media_drm.Flags;

		/**
		* The controller (in the Media Widevine settings) enforces L3 security level
		* of Widevine CDM.
		* The controller (in the Media Drm settings) enforces software secure crypto.
		*/
		public class ForceL3FallbackPreferenceController extends TogglePreferenceController {
		private static final String TAG = "ForceL3FallbackPreferenceController";
		public class ForceSwSecureCryptoFallbackPreferenceController extends TogglePreferenceController {
		private static final String TAG = "ForceSwSecureCryptoFallbackPreferenceController";

		public ForceL3FallbackPreferenceController(Context context, String preferenceKey) {
		public ForceSwSecureCryptoFallbackPreferenceController(Context context, String preferenceKey) {
		super(context, preferenceKey);
		}

+7 −7

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.settings.development.widevine;
		package com.android.settings.development.mediadrm;

		import android.app.settings.SettingsEnums;
		import android.content.Context;
		@@ -27,12 +27,12 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler;
		import com.android.settingslib.search.SearchIndexable;

		/**
		* Fragment for native widevine settings in Developer options.
		* Fragment for native mediadrm settings in Developer options.
		*/
		@SearchIndexable
		public class WidevineSettingsFragment extends DashboardFragment implements
		public class MediaDrmSettingsFragment extends DashboardFragment implements
		DeveloperOptionAwareMixin {
		private static final String TAG = "WidevineSettings";
		private static final String TAG = "MediaDrmSettings";

		@Override
		protected String getLogTag() {
		@@ -41,16 +41,16 @@ public class WidevineSettingsFragment extends DashboardFragment implements

		@Override
		protected int getPreferenceScreenResId() {
		return R.xml.widevine_settings;
		return R.xml.media_drm_settings;
		}

		@Override
		public int getMetricsCategory() {
		return SettingsEnums.WIDEVINE_SETTINGS;
		return SettingsEnums.MEDIA_DRM_SETTINGS;
		}

		public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider(R.xml.widevine_settings) {
		new BaseSearchIndexProvider(R.xml.media_drm_settings) {

		@Override
		protected boolean isPageSearchEnabled(Context context) {