Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use new naming for Widevine Developer option." into main

Browse Source
This commit is contained in:
Kyle Zhang
2024-03-27 18:54:40 +00:00
committed by Android (Google) Code Review
parent 0c85e4bca9 fc21e32cb3
commit be7215cc51
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/development_settings.xml
View File

@@ -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>

10
res/xml/widevine_settings.xml → res/xml/media_drm_settings.xml
View File

@@ -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>