Merge "Add setting to disable camera gesture" into mnc-dr-dev

diff --combined res/values/strings.xml
index 38b33ac,9fa9225..88269e8
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -745,12 -745,12 +745,12 @@@
      <string name="security_settings_fingerprint_enroll_dialog_delete">Delete</string>
      <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=22]-->
      <string name="security_settings_fingerprint_enroll_start_title">Let\u2019s start!</string>
 -    <!-- Message shown in fingerprint enrollment dialog to begin enrollment -->
 -    <string name="security_settings_fingerprint_enroll_start_message">Put your finger on the fingerprint sensor. Lift after you feel a vibration.</string>
 +    <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
 +    <string name="security_settings_fingerprint_enroll_start_message">Put your finger on the sensor and lift after you feel a vibration</string>
      <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=28] -->
 -    <string name="security_settings_fingerprint_enroll_repeat_title">Great! Now repeat.</string>
 -    <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor -->
 -    <string name="security_settings_fingerprint_enroll_repeat_message">Put the same finger on the fingerprint sensor and lift after you feel a vibration.</string>
 +    <string name="security_settings_fingerprint_enroll_repeat_title">Great! Now repeat</string>
 +    <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
 +    <string name="security_settings_fingerprint_enroll_repeat_message">Move your finger slightly to add all the different parts of your fingerprint</string>
      <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=22] -->
      <string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added!</string>
      <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
@@@ -6742,14 -6742,6 +6742,14 @@@
          <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> apps allowed to ignore battery optimization</item>
      </plurals>
  
 +    <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
 +    <string name="high_power_prompt_title">Ignore battery optimizations?</string>
 +
 +    <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
 +    <string name="high_power_prompt_body">Let app
 +        <xliff:g id="app_name" example="Settings">%1$s</xliff:g> stay connected in the
 +        background?  This may use more battery.</string>
 +
      <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
      <string name="battery_summary"><xliff:g id="percentage" example="2">%1$d</xliff:g>%% use since last full charge</string>
  
@@@ -6768,46 -6760,22 +6768,46 @@@
      <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
      <string name="additional_permissions_more"><xliff:g id="count" example="2">%1$d</xliff:g> more</string>
  
 -    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
 +    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
           select what the USB connection for this device should be used for. This choice
           is for charging only. -->
 -    <string name="usb_use_charging_only">Charging only</string>
 -    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
 +    <string name="usb_use_charging_only">Charging</string>
 +    <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
 +         user select what the USB connection for this device should be used for. This choice
 +         is for charging only. -->
 +    <string name="usb_use_charging_only_desc">Just charge this device</string>
 +    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
 +         select what the USB connection for this device should be used for. This choice
 +         is for powering the other device only. -->
 +    <string name="usb_use_power_only">Power supply</string>
 +    <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
 +         user select what the USB connection for this device should be used for. This choice
 +         is for powering the other device only. -->
 +    <string name="usb_use_power_only_desc">Charge the other connected device</string>
 +    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
 +         select what the USB connection for this device should be used for. This choice
 +         is for transferring files via MTP. -->
 +    <string name="usb_use_file_transfers">File transfers</string>
 +    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
           select what the USB connection for this device should be used for. This choice
           is for transferring files via MTP. -->
 -    <string name="usb_use_file_transfers">Transfer files (MTP)</string>
 -    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
 +    <string name="usb_use_file_transfers_desc">Transfer files to Windows or Mac (MTP)</string>
 +    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
 +         select what the USB connection for this device should be used for. This choice
 +         is for transferring photos via PTP. -->
 +    <string name="usb_use_photo_transfers">Photo transfer (PTP)</string>
 +    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
           select what the USB connection for this device should be used for. This choice
           is for transferring photos via PTP. -->
 -    <string name="usb_use_photo_transfers">Transfer photos (PTP)</string>
 -    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
 +    <string name="usb_use_photo_transfers_desc">Transfer photos or files if MTP is not supported (PTP)</string>
 +    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
           select what the USB connection for this device should be used for. This choice
           is for entering MIDI mode. -->
      <string name="usb_use_MIDI">MIDI</string>
 +    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
 +         select what the USB connection for this device should be used for. This choice
 +         is for entering MIDI mode. -->
 +    <string name="usb_use_MIDI_desc">Use device for MIDI input</string>
      <!-- The title used in a dialog which lets the user select what the USB connection
           for this device should be used for. Choices are usb_use_charging_only,
           usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
@@@ -6981,4 -6949,11 +6981,11 @@@
      <string name="write_settings_on">Yes</string>
      <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
      <string name="write_settings_off">No</string>
+ 
+     <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+     <string name="camera_gesture_title">Double twist for camera</string>
+ 
+     <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+     <string name="camera_gesture_desc">Open the camera app by twisting your wrist twice</string>
+ 
  </resources>