Merge \"Add summary for Settings->Gestures.\" into nyc-mr1-dev

am: f46dabcf0f

Change-Id: I1754736fb69495e5601b2e13038e30df1482b792
This commit is contained in:
Doris Ling
2016-07-08 23:03:44 +00:00
committed by android-build-merger
2 changed files with 5 additions and 0 deletions

View File

@@ -2935,6 +2935,8 @@
android:value="com.android.settings.category.device" /> android:value="com.android.settings.category.device" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.gestures.GestureSettings" /> android:value="com.android.settings.gestures.GestureSettings" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/gesture_preference_summary" />
</activity> </activity>
<activity android:name="BackupSettingsActivity" <activity android:name="BackupSettingsActivity"

View File

@@ -7686,6 +7686,9 @@
<!-- Preference title for gesture settings [CHAR LIMIT=25]--> <!-- Preference title for gesture settings [CHAR LIMIT=25]-->
<string name="gesture_preference_title">Gestures</string> <string name="gesture_preference_title">Gestures</string>
<!-- Preference summary for gesture settings [CHAR LIMIT=NONE]-->
<string name="gesture_preference_summary">Quick gestures to control your phone</string>
<!-- Title text for double tap power for camera [CHAR LIMIT=60]--> <!-- Title text for double tap power for camera [CHAR LIMIT=60]-->
<string name="double_tap_power_for_camera_title">Jump to Camera</string> <string name="double_tap_power_for_camera_title">Jump to Camera</string>