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

Commit 4a921534 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Apply top intro preference for app pinning feature"

parents e5ee4152 ee4bbb29
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -9415,10 +9415,11 @@
    <!-- [CHAR LIMIT=28] Screen pinning title -->
    <string name="screen_pinning_title">App pinning</string>
    <!-- [CHAR LIMIT=none] Screen pinning introduction -->
    <string name="app_pinning_intro">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.</string>
    <!-- [CHAR LIMIT=none] Screen pinning description -->
    <string name="screen_pinning_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.
        When an app is pinned, the pinned app may open other apps and personal data may be accessible.
        \n\nTo use app pinning:
        \t\n1.\tTurn on app pinning
        \t\n2.\tOpen Overview
@@ -9426,8 +9427,7 @@
    </string>
    <!-- [CHAR LIMIT=none] Screen pinning 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.
        When 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 user instead.
        \n\nTo use app pinning:
        \t\n1.\tTurn on app pinning
+6 −2
Original line number Diff line number Diff line
@@ -19,14 +19,18 @@
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:title="@string/screen_pinning_title">

    <com.android.settingslib.widget.TopIntroPreference
        android:title="@string/app_pinning_intro"
        settings:searchable="false"/>

    <SwitchPreference
        android:key="use_screen_lock"
        android:title="@string/screen_pinning_unlock_none" />
        android:title="@string/screen_pinning_unlock_none"
        settings:allowDividerAbove="true"/>

    <com.android.settingslib.widget.FooterPreference
        android:key="screen_pinning_settings_screen_footer"
        android:title="@string/screen_pinning_description"
        android:selectable="false"
        settings:searchable="false" />

</PreferenceScreen>