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

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

Snap for 6469672 from cb8be1de to rvc-release

Change-Id: I355a4c6520e462e42b930c3430ec3c3f241568e9
parents 4f3d4925 cb8be1de
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@
-->
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/slice_slider_layout"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical">
+3 −0
Original line number Diff line number Diff line
@@ -427,4 +427,7 @@

    <!-- Developer options shared data screens related dimensions -->
    <dimen name="list_preferred_item_padding">16dp</dimen>

    <!-- Output switcher panel related dimensions -->
    <dimen name="output_switcher_slice_padding_top">12dp</dimen>
</resources>
+5 −10
Original line number Diff line number Diff line
@@ -7485,14 +7485,6 @@
    <string name="connected_devices_dashboard_no_driving_mode_summary">Bluetooth, NFC</string>
    <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary">Bluetooth</string>
    <!--Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
    <string name="connected_devices_dashboard_android_auto_summary">Bluetooth, Android Auto, driving mode, NFC</string><!--
    Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
    <string name="connected_devices_dashboard_android_auto_no_nfc_summary">Bluetooth, Android Auto, driving mode</string>
    <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
    <string name="connected_devices_dashboard_android_auto_no_driving_mode_summary">Bluetooth, Android Auto, NFC</string>
    <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
    <string name="connected_devices_dashboard_android_auto_no_nfc_no_driving_mode">Bluetooth, Android Auto</string>
    <!-- Summary for Tap & pay settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
    <string name="nfc_and_payment_settings_payment_off_nfc_off_summary">Unavailable because NFC is off</string>
    <!-- Summary for Tap & pay settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
@@ -9250,10 +9242,10 @@
        \t\n3.\tTap the app icon at the top of the screen, then tap Pin
    </string>
    <!-- [CHAR LIMIT=none] Screen pinning description -->
    <string name="screen_pinning_guest_mode_description">
    <string name="screen_pinning_guest_user_description">
        App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game.
        \n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible.
        \n\nIf you want to securely share your device with someone, try using a guest profile instead.
        \n\nIf you want to securely share your device with someone, try using a guest user instead.
        \n\nTo use app pinning:
        \t\n1.\tTurn on app pinning
        \t\n2.\tOpen Overview
@@ -12074,4 +12066,7 @@
    <string name="no_5g_in_dsds_text" product="device">When using 2 SIMs, this device will be limited to 4G. <annotation id="url">Learn more</annotation>.</string>
    <!-- Help URI, 5G limitation in DSDS condition. [DO NOT TRANSLATE] -->
    <string name="help_uri_5g_dsds" translatable="false"></string>
    <!-- Developer settings: app freezer title [CHAR LIMIT=50]-->
    <string name="cached_apps_freezer">Suspend execution for cached apps</string>
</resources>
+1 −2
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@
        android:selectable="false"
        android:layout="@layout/dark_ui_activation_button"
        settings:allowDividerBelow="true"
        settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"
        settings:keywords="@string/keywords_dark_ui_mode"/>
        settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"/>

    <com.android.settingslib.widget.FooterPreference
            android:key="dark_ui_footer"
+6 −0
Original line number Diff line number Diff line
@@ -584,6 +584,12 @@
            android:title="@string/show_all_anrs"
            android:summary="@string/show_all_anrs_summary" />

        <ListPreference
            android:key="cached_apps_freezer"
            android:title="@string/cached_apps_freezer"
            android:entries="@array/cached_apps_freezer_entries"
            android:entryValues="@array/cached_apps_freezer_values" />

        <SwitchPreference
            android:key="show_notification_channel_warnings"
            android:title="@string/show_notification_channel_warnings"
Loading