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

Commit c12b711b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-08461da0-a262-4ebb-8c32-784b60a151df-for-git_oc-mr1-release-42... 

release-request-08461da0-a262-4ebb-8c32-784b60a151df-for-git_oc-mr1-release-4216972 snap-temp-L74000000086000437

Change-Id: Ia1143609a4a5f67cf818f3b455750123f1c4563f
parents 8a376c7e dac62d24

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
    <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>

    <uses-permission android:name="android.permission.READ_PRINT_SERVICES" />

    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />



    <application android:label="@string/settings_label"

            android:icon="@drawable/ic_launcher_settings"

res/values/strings.xml

+5 −4
Original line number Diff line number Diff line
@@ -2040,8 +2040,6 @@ 
    <string name="wifi_p2p_delete_group_message">Forget this group?</string>









    <!-- Wifi AP settings-->









    <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->









    <string name="wifi_tether_checkbox_text">Portable Wi\u2011Fi hotspot</string>









    <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->









    <string name="wifi_hotspot_checkbox_text">Wi\u2011Fi hotspot</string>









    <!-- Summary text when turning hotspot off -->








@@ -2055,13 +2053,13 @@















    <!-- Wifi hotspot settings -->









    <!-- Label for Wifi hotspot name. -->









    <string name="wifi_hotspot_name_title">Wi\u2011Fi name</string>









    <string name="wifi_hotspot_name_title">Hotspot name</string>









    <!-- Summary for Wifi hotspot name when connection is in progress. -->









    <string name="wifi_hotspot_name_summary_connecting">Turning on <xliff:g id="wifi_hotspot_name">%1$s</xliff:g>...</string>









    <!-- Summary for Wifi hotspot name when connected. -->









    <string name="wifi_hotspot_name_summary_connected">Other devices can connect to <xliff:g id="wifi_hotspot_name">%1$s</xliff:g></string>









    <!-- Label for Wifi hotspot password. -->









    <string name="wifi_hotspot_password_title">Wi\u2011Fi password</string>









    <string name="wifi_hotspot_password_title">Hotspot password</string>









    <!-- Label for Wifi hotspot AP Band. -->









    <string name="wifi_hotspot_ap_band_title">AP Band</string>









    <!-- Wifi hotspot footer info for regular hotspot [CHAR LIMIT=NONE]-->








@@ -3114,6 +3112,9 @@







    <!-- Title for a screen containing all device reset options [CHAR LIMIT=50] -->









    <string name="reset_dashboard_title">Reset options</string>

















    <!-- Summary text for a screen containing all device reset options [CHAR LIMIT=None] -->









    <string name="reset_dashboard_summary">Network, apps, or device can be reset</string>

















    <!-- Reset Network -->









    <!-- Button title to reset Wi-Fi settings, Mobile data setting, bluetooth settings -->









    <string name="reset_network_title">Reset Wi-Fi, mobile &amp; Bluetooth</string>
































res/xml/encryption_and_credential.xml



+3
−8






























Original line number
Diff line number
Diff line







@@ -24,25 +24,21 @@







            android:order="100">



















        <com.android.settingslib.RestrictedPreference android:key="credential_storage_type"









                android:title="@string/credential_storage_type"









                android:persistent="false" />









                android:title="@string/credential_storage_type" />



















        <Preference android:key="trusted_credentials"









                android:title="@string/trusted_credentials"









                android:summary="@string/trusted_credentials_summary"









                android:persistent="false"









                android:fragment="com.android.settings.TrustedCredentialsSettings"/>



















        <com.android.settingslib.RestrictedPreference android:key="user_credentials"









                android:title="@string/user_credentials"









                android:summary="@string/user_credentials_summary"









                android:persistent="false"









                android:fragment="com.android.settings.UserCredentialsSettings"/>



















        <com.android.settingslib.RestrictedPreference android:key="credentials_install"









                android:title="@string/credentials_install"









                android:summary="@string/credentials_install_summary"









                android:persistent="false">









                android:summary="@string/credentials_install_summary">



















            <intent android:action="android.credentials.INSTALL"









                    android:targetPackage="com.android.certinstaller"








@@ -52,8 +48,7 @@

















        <com.android.settingslib.RestrictedPreference android:key="credentials_reset"









                android:title="@string/credentials_reset"









                android:summary="@string/credentials_reset_summary"









                android:persistent="false">









                android:summary="@string/credentials_reset_summary">



















            <intent android:action="com.android.credentials.RESET"









                    android:targetPackage="com.android.settings"
































res/xml/security_settings_encrypted.xml



+1
−3






























Original line number
Diff line number
Diff line







@@ -18,12 +18,10 @@







                  android:title="@string/security_settings_title">



















    <PreferenceCategory









        android:key="security_category"









        android:key="security_category_for_encrypted_device"









        android:title="@string/crypt_keeper_settings_title">



















        <Preference









            android:enabled="false"









            android:shouldDisableView="false"









            android:key="crypt_keeper_encrypt_title"









            android:title="@string/crypt_keeper_encrypt_title"









            android:summary="@string/crypt_keeper_encrypted_summary"/>
































res/xml/security_settings_unencrypted.xml



+2
−2






























Original line number
Diff line number
Diff line







@@ -18,7 +18,7 @@







                  android:title="@string/crypt_keeper_settings_title">



















    <PreferenceCategory









        android:key="security_category"









        android:key="security_category_for_unencrypted_device"









        android:title="@string/crypt_keeper_settings_title">



















        <Preference