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

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

Snap for 10154358 from 28edfb8d to udc-release 

Change-Id: Ib9d209d6fd01fb52de34f835fe8c25bcc438cdd9
parents 4c2be488 28edfb8d

res/layout/homepage_preference.xml

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="start"

            android:textAlignment="viewStart"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:hyphenationFrequency="normalFast"

res/values/strings.xml

+9 −1
Original line number Diff line number Diff line
@@ -8164,6 +8164,12 @@ 
    <!-- [CHAR LIMIT=NONE] Channel notification settings: Block option description-->

    <string name="notification_content_block_summary">Never show notifications in the shade or on peripheral devices</string>









    <!-- [CHAR LIMIT=NONE] App notification settings: Full screen intent permission option title -->









    <string name="app_notification_fsi_permission_title">Allow full screen notifications</string>

















    <!-- [CHAR LIMIT=NONE] App notification settings: Full screen intent permission option description -->









    <string name="app_notification_fsi_permission_summary">Allow notifications to take up the full screen when the device is locked</string>

















    <!-- [CHAR LIMIT=NONE BACKUP_MESSAGE_ID:7166470350070693657] App notification settings: Badging option title -->









    <string name="notification_badge_title">Allow notification dot</string>
















@@ -10158,7 +10164,9 @@







    <string name="financed_privacy_restrictions_removed">All restrictions are removed from the device</string>









    <!-- Label explaining that the app installed by credit provider can be uninstalled. [CHAR LIMIT=60]-->









    <string name="financed_privacy_uninstall_creditor_app">You can uninstall the creditor app</string>

















    <!-- Title of setting on security settings screen on a device provisioned by Device Lock. This will take the user to a screen in Device Lock with information about what a device provider can control and their impact on the user's privacy. Shown on Device Lock provisioned devices only. [CHAR LIMIT=NONE] -->









    <!-- TODO(b/282040794): Update the title -->









    <string name="device_lock_info">Device Lock</string>









    <!-- Strings for displaying which applications were set as default for specific actions. -->









    <!-- Title for the apps that have been set as default handlers of camera-related intents. [CHAR LIMIT=30] -->









    <string name="default_camera_app_title">{count, plural,

























res/xml/app_notification_settings.xml



+27
−8






























Original line number
Diff line number
Diff line







@@ -59,38 +59,57 @@







    <com.android.settingslib.RestrictedSwitchPreference









        android:key="allow_sound"









        android:title="@string/allow_interruption"









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









        android:summary="@string/allow_interruption_summary"









        settings:allowDividerAbove="true"









        settings:allowDividerBelow="false" />



















    <!-- Visibility Override -->









    <com.android.settings.RestrictedListPreference









        android:key="visibility_override"









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









        android:title="@string/app_notification_visibility_override_title"









        settings:allowDividerAbove="true"









        settings:allowDividerBelow="false" />



















    <!-- Bypass DND -->









    <com.android.settingslib.RestrictedSwitchPreference









        android:key="bypass_dnd"









        android:title="@string/app_notification_override_dnd_title"









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









        android:summary="@string/app_notification_override_dnd_summary"









        settings:allowDividerAbove="true"









        settings:allowDividerBelow="false" />



















    <!-- Allow full-screen intents -->









    <com.android.settingslib.RestrictedSwitchPreference









        android:key="fsi_permission"









        android:title="@string/app_notification_fsi_permission_title"









        android:summary="@string/app_notification_fsi_permission_summary"









        settings:allowDividerAbove="true"









        settings:allowDividerBelow="false" />



















    <!-- Show badge -->









    <com.android.settingslib.RestrictedSwitchPreference









        android:key="badge"









        android:title="@string/notification_badge_title"









        android:icon="@drawable/ic_notification_dot"









        settings:useAdditionalSummary="true"









        settings:restrictedSwitchSummary="@string/enabled_by_admin"









        android:order="1001"









        android:icon="@drawable/ic_notification_dot"









        settings:allowDividerAbove="true"









        settings:restrictedSwitchSummary="@string/enabled_by_admin" />









        settings:allowDividerBelow="false" />



















    <Preference









        android:key="app_link"









        android:order="1003"









        android:icon="@drawable/ic_settings_24dp"









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









        android:title="@string/app_settings_link"









        android:order="1003"









        settings:allowDividerAbove="true"









        settings:allowDividerBelow="false" />



















    <com.android.settingslib.widget.FooterPreference









        android:key="deleted"









        android:icon="@drawable/ic_trash_can"









        android:order="8000" />









        android:order="8000"









        settings:allowDividerAbove="true"









        settings:allowDividerBelow="false" />



















</PreferenceScreen>
























res/xml/more_security_privacy_settings.xml



+7
−0






























Original line number
Diff line number
Diff line







@@ -146,6 +146,13 @@







            android:fragment="com.android.settings.enterprise.EnterprisePrivacySettings"









            settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>



















        <Preference









            android:key="device_lock_info"









            android:title="@string/device_lock_info"









            android:summary="@string/summary_placeholder"









            settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController">









            <intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/>









        </Preference>









    </PreferenceCategory>



















    <Preference
































res/xml/security_advanced_settings.xml



+7
−0






























Original line number
Diff line number
Diff line







@@ -58,6 +58,13 @@







            android:fragment="com.android.settings.enterprise.EnterprisePrivacySettings"









            settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>



















        <Preference









            android:key="device_lock_info"









            android:title="@string/device_lock_info"









            android:summary="@string/summary_placeholder"









            settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController">









            <intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/>









        </Preference>









    </PreferenceCategory>



















    <Preference