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

Commit eb1f56c2 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Update strings in dialogs" into tm-qpr-dev am: b766fb53 am: eec5d9ee am: 4af761f2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21672659



Change-Id: I8a17625f715921a8657c16ed8938b4108a0fa446
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37cb77de 4af761f2

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -2431,7 +2431,7 @@ 


    <!-- Shows in a dialog presented to the user to authorize this app to display a Device controls

         panel (embedded activity) instead of controls rendered by SystemUI [CHAR LIMIT=NONE] -->

    <string name="controls_panel_authorization">When you add <xliff:g id="appName" example="My app">%s</xliff:g>, it can add controls and content to this panel. In some apps, you can choose which controls show up here.</string>

    <string name="controls_panel_authorization"><xliff:g id="appName" example="My app">%s</xliff:g>can choose which controls and content show here.</string>



    <!-- Shows in a dialog presented to the user to authorize this app removal from a Device

         controls panel [CHAR LIMIT=NONE] -->
@@ -2491,7 +2491,7 @@ 
    <!-- Title of the dialog to control certain devices from lock screen without auth [CHAR LIMIT=NONE] -->

    <string name="controls_settings_trivial_controls_dialog_title">Control devices from lock screen?</string>

    <!-- Message of the dialog to control certain devices from lock screen without auth [CHAR LIMIT=NONE] -->

    <string name="controls_settings_trivial_controls_dialog_message">You can control some devices without unlocking your phone or tablet.\n\nYour device app determines which devices can be controlled in this way.</string>

    <string name="controls_settings_trivial_controls_dialog_message">You can control some devices without unlocking your phone or tablet. Your device app determines which devices can be controlled in this way.</string>

    <!-- Neutral button title of the controls dialog [CHAR LIMIT=NONE] -->

    <string name="controls_settings_dialog_neutral_button">No thanks</string>

    <!-- Positive button title of the controls dialog  [CHAR LIMIT=NONE] -->