Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f am: f680c9b0b5 am: 85e6aba27f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: I8e6d18b8be6960be4e1557a07405d65412205b70
This commit is contained in:
TreeHugger Robot
2021-08-14 07:49:54 +00:00
committed by Automerger Merge Worker
15 changed files with 479 additions and 11 deletions

View File

@@ -13597,6 +13597,15 @@
<!-- Summary for Game settings entry. [CHAR_LIMIT=NONE] -->
<string name="game_settings_summary">Turn on Game Dashboard shortcut, etc</string>
<!-- Content description of the previous button to bring user to the previous preview page. -->
<string name="previous_page_content_description">Previous</string>
<!-- Content description of the next button to bring user to the next preview page. -->
<string name="next_page_content_description">Next</string>
<!-- Content description of preview pager in colors preview -->
<string name="colors_viewpager_content_description">Color preview</string>
<!-- Bluetooth sim card permission alert for notification title [CHAR LIMIT=none] -->
<string name="bluetooth_sim_card_access_notification_title">SIM card access request</string>
<!-- Bluetooth sim card permission alert for notification content [CHAR LIMIT=none] -->