Merge "Merge "Controls UI - Rename 'quick controls'" into rvc-dev am: bc445710f5 am: 07d27761e3" into rvc-d1-dev-plus-aosp am: de64ad30e1

Change-Id: I2f789e1fb82632069bfe12cbde0e46fd1b7495b9
This commit is contained in:
Automerger Merge Worker
2020-04-06 17:47:07 +00:00

View File

@@ -2647,15 +2647,15 @@
<!-- Title for Magnification Controls Window [CHAR LIMIT=NONE] -->
<string name="magnification_controls_title">Magnification Window Controls</string>
<!-- Quick Controls strings -->
<!-- Quick Controls empty state, title [CHAR LIMIT=30] -->
<string name="quick_controls_title">Quick controls</string>
<!-- Quick Controls empty state, subtitle [CHAR LIMIT=100] -->
<!-- Device Controls strings -->
<!-- Device Controls empty state, title [CHAR LIMIT=30] -->
<string name="quick_controls_title">Device controls</string>
<!-- Device Controls empty state, subtitle [CHAR LIMIT=100] -->
<string name="quick_controls_subtitle">Add controls for your connected devices</string>
<!-- Quick Controls setup, title [CHAR LIMIT=50] -->
<string name="quick_controls_setup_title">Set up quick controls</string>
<!-- Quick Controls setup, subtitle [CHAR LIMIT=100] -->
<!-- Device Controls setup, title [CHAR LIMIT=50] -->
<string name="quick_controls_setup_title">Set up device controls</string>
<!-- Device Controls setup, subtitle [CHAR LIMIT=100] -->
<string name="quick_controls_setup_subtitle">Hold the Power button to access your controls</string>
<!-- Controls management providers screen title [CHAR LIMIT=60]-->
@@ -2679,7 +2679,7 @@
<string name="controls_favorite_other_zone_header">Other</string>
<!-- Controls dialog title [CHAR LIMIT=40] -->
<string name="controls_dialog_title">Add to quick controls</string>
<string name="controls_dialog_title">Add to device controls</string>
<!-- Controls dialog add to favorites [CHAR LIMIT=40] -->
<string name="controls_dialog_ok">Add to favorites</string>
<!-- Controls dialog message [CHAR LIMIT=NONE] -->