Merge "Wallet/controls - Migrate existing settings" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
db624992ed
@@ -8079,8 +8079,7 @@
|
||||
<string name="keywords_profile_challenge">work challenge, work, profile</string>
|
||||
<string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
|
||||
<string name="keywords_gesture">gestures</string>
|
||||
<string name="keywords_cards_passes">cards, passes</string>
|
||||
<string name="keywords_device_controls">device controls, controls</string>
|
||||
<string name="keywords_wallet">wallet</string>
|
||||
<string name="keywords_payment_settings">pay, tap, payments</string>
|
||||
<string name="keywords_backup">backup, back up</string>
|
||||
<string name="keywords_assist_gesture_launch">gesture</string>
|
||||
@@ -12969,32 +12968,11 @@
|
||||
<!-- Power menu setting title [CHAR LIMIT=NONE] -->
|
||||
<string name="power_menu_setting_title">Power button menu</string>
|
||||
|
||||
<!-- Power menu setting option cards and passes [CHAR LIMIT=NONE] -->
|
||||
<string name="power_menu_cards_passes">Show cards & passes</string>
|
||||
|
||||
<!-- Power menu setting lock screen category name [CHAR LIMIT=40] -->
|
||||
<string name="power_menu_lock_screen_category">Lock screen</string>
|
||||
|
||||
<!-- Power menu setting option none [CHAR LIMIT=NONE] -->
|
||||
<string name="power_menu_none">Don\u2019t show any content</string>
|
||||
|
||||
<!-- Power menu setting Privacy [CHAR LIMIT=40] -->
|
||||
<string name="power_menu_privacy">Sensitive content</string>
|
||||
|
||||
<!-- Power menu setting privacy show all [CHAR LIMIT=NONE] -->
|
||||
<string name="power_menu_privacy_show">Show cards and controls when locked</string>
|
||||
|
||||
<!-- Power menu setting privacy show controls [CHAR LIMIT=NONE] -->
|
||||
<string name="power_menu_privacy_show_controls">Show controls when locked</string>
|
||||
|
||||
<!-- Power menu setting privacy show cards [CHAR LIMIT=NONE] -->
|
||||
<string name="power_menu_privacy_show_cards">Show cards when locked</string>
|
||||
|
||||
<!-- Power menu setting privacy hide all [CHAR LIMIT=NONE] -->
|
||||
<string name="power_menu_privacy_hide">Hide cards and controls when locked</string>
|
||||
|
||||
<!-- Power menu setting privacy no secure screen lock set [CHAR_LIMIT=NONE] -->
|
||||
<string name="power_menu_privacy_not_secure">To use, first set a screen lock</string>
|
||||
<string name="lockscreen_privacy_not_secure">To use, first set a screen lock</string>
|
||||
|
||||
<!-- Power menu setting use long press power to invoke assistant. [CHAR_LIMIT=NONE] -->
|
||||
<string name="power_menu_long_press_for_assist">Hold for Assistant</string>
|
||||
@@ -13002,17 +12980,15 @@
|
||||
<!-- Power menu setting use log press power to invoke assistant summary. [CHAR_LIMIT=NONE] -->
|
||||
<string name="power_menu_long_press_for_assist_summary">Trigger the Assistant by holding the power button</string>
|
||||
|
||||
<!-- Wallet (formerly Cards and passes) toggle name [CHAR LIMIT=60] -->
|
||||
<string name="lockscreen_privacy_wallet_setting_toggle">Show wallet</string>
|
||||
<!-- Wallet (formerly Cards and passes) summary [CHAR LIMIT=NONE] -->
|
||||
<string name="lockscreen_privacy_wallet_summary">Allow access to wallet from lock screen and quick settings</string>
|
||||
|
||||
<!-- Device controls toggle name [CHAR LIMIT=60] -->
|
||||
<string name="device_controls_setting_toggle">Show device controls</string>
|
||||
|
||||
<!-- Cards and passes toggle name [CHAR LIMIT=60] -->
|
||||
<string name="cards_passes_setting_toggle">Show cards & passes</string>
|
||||
|
||||
<!-- Device controls toggle subtitle [CHAR LIMIT=NONE] -->
|
||||
<string name="device_controls_setting_subtitle">To access controls for connected devices, hold the Power button</string>
|
||||
|
||||
<!-- Cards and passes toggle subtitle [CHAR LIMIT=NONE] -->
|
||||
<string name="cards_passes_setting_subtitle">To access things like your payment methods and boarding passes, press and hold the Power button.</string>
|
||||
<string name="lockscreen_privacy_controls_setting_toggle">Show device controls</string>
|
||||
<!-- Device controls summary [CHAR LIMIT=NONE] -->
|
||||
<string name="lockscreen_privacy_controls_summary">Access controls when locked</string>
|
||||
|
||||
<!-- Title for RTT setting. [CHAR LIMIT=NONE] -->
|
||||
<string name="rtt_settings_title"></string>
|
||||
|
||||
Reference in New Issue
Block a user