PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev

Browse Source 
automerge: 0ae5f60

* commit '0ae5f6037b68794dc8a394c24a6ec8413c97555f':
  Screen pinning: fix strings and add scrollview
This commit is contained in:
Jason Monk
2014-11-07 17:18:40 +00:00
committed by android-build-merger
parent eaa14eb8a9 0ae5f6037b
commit cbf1d5d0dc
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -5929,7 +5929,7 @@
<!-- [CHAR LIMIT=28] Screen pinning title -->
<string name="screen_pinning_title">Screen pinning</string>
<!-- [CHAR LIMIT=300] Screen pinning description -->
<string name="screen_pinning_description">When turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure screen pinning is turned on.\n\n2. Open the screen you want to pin.\n\n3. Touch Overview.\n\n4. Touch the pin icon.</string>
<string name="screen_pinning_description">When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure screen pinning is turned on.\n\n2. Open the screen you want to pin.\n\n3. Touch Overview.\n\n4. Swipe up and then touch the pin icon.</string>
<!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
<string name="screen_pinning_unlock_pattern">Ask for unlock pattern before unpinning</string>
<!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->