Merge "[2/2] OmniGears: Quick swipe" into android-4.4
diff --git a/res/values-cs/custom_strings.xml b/res/values-cs/custom_strings.xml
index 0d8b05f..1aa990c 100644
--- a/res/values-cs/custom_strings.xml
+++ b/res/values-cs/custom_strings.xml
@@ -370,7 +370,17 @@
<string name="icon_picker_sms">Zprávy</string>
<string name="icon_picker_twitter">Twitter</string>
- <!-- Status Bar QS Quick pulldown -->
- <string name="qs_quick_pulldown_title">Rychlé nastavení stažením</string>
- <string name="qs_quick_pulldown_summary">Přístup k rychlému nastavení tahem dolů na pravé straně stavové lišty</string>
+ <!-- QuickSettings: Quick Pulldown -->
+ <string name="title_quick_pulldown">Rychlé vysunutí nabídky</string>
+ <string name="summary_quick_pulldown">Nastavení rychlého vysunutí nabídky jedním prstem</string>
+ <string name="quick_pulldown_off">Vypnuto</string>
+ <string name="quick_pulldown_centre">Střed</string>
+ <string name="quick_pulldown_left">Vlevo</string>
+ <string name="quick_pulldown_right">Vpravo</string>
+
+ <!-- Cursor control -->
+ <string name="volume_key_cursor_control_title">Ovládání kurzoru</string>
+ <string name="volume_key_cursor_control_on">Doleva/doprava</string>
+ <string name="volume_key_cursor_control_on_reverse">Doprava/Doleva</string>
+
</resources>
diff --git a/res/values-fr/custom_strings.xml b/res/values-fr/custom_strings.xml
index 5edb393..7f0fbf7 100644
--- a/res/values-fr/custom_strings.xml
+++ b/res/values-fr/custom_strings.xml
@@ -20,26 +20,23 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="ok">OK</string>
<string name="reset">Réinitialiser</string>
- <string name="bars_and_menus_settings">Barre et menu</string>
+ <string name="bars_and_menus_settings">Barres et menus</string>
<string name="active_display_settings">ActiveDisplay</string>
<string name="bars_and_menus_category_status_bar_title">Barre de statut</string>
+ <string name="bars_and_menus_category_navigation_bar_title">Barre de navigation</string>
<string name="status_bar_battery_title">Style de la batterie</string>
<string name="status_bar_toggle_brightness">Contrôle du rétroéclairage</string>
<string name="status_bar_toggle_brightness_summary">Ajuster la luminosité du rétroéclairage en glissant dans la barre de statut</string>
<string name="status_bar_toggle_info">Luminosité automatique activée</string>
<string name="status_bar_signal_text_title">Style du statut du signal</string>
<string name="status_bar_style_icon">Icône</string>
- <string name="status_bar_style_hidden">Masqué</string>
+ <string name="status_bar_style_hidden">Masquée</string>
<string name="status_bar_signal_text_show_text">Texte</string>
<string name="status_bar_battery_status_percentage">Pourcentage</string>
<string name="status_bar_battery_status_circle">Cercle</string>
<string name="status_bar_battery_status_circle_percentage">Cercle avec pourcentage</string>
<string name="status_bar_notif_count_title">Afficher le compteur de notifications</string>
<string name="status_bar_notif_count_summary">Afficher le nombre de notifications en attente</string>
- <string name="icon_picker_title">Source de l\'icône</string>
- <string name="icon_picker_system_icons_title">Icônes système</string>
- <string name="icon_picker_gallery_title">Galerie</string>
- <string name="icon_picker_pack_title">Pack d\'icônes</string>
<string name="profile_applist_title">Applications</string>
<string name="profile_choose_app">Choisir l\'application</string>
<string name="profiles_add">Ajouter</string>
@@ -138,6 +135,11 @@
<string name="button_volume_keys_title">Volume</string>
<string name="button_volume_wake_title">Réveil avec boutons Volume</string>
<string name="button_volume_wake_summary">Un appui sur un bouton de volume sortira votre appareil de la veille</string>
+ <string name="button_volume_music_control_title">Contrôle de la musique</string>
+ <string name="button_volume_music_control_summary">Lorsque l\'écran est éteint, un appui long sur les boutons de volume permet de changer le titre en cours de lecture</string>
+ <string name="button_headsethook_title">Casque</string>
+ <string name="button_headsethook_launch_voice_title">Casque à commande vocale</string>
+ <string name="button_headsethook_launch_voice_summary">Un appui sur le bouton du casque lance la commande vocale</string>
<string name="show_network_speed">Indicateur de vitesse réseau</string>
<string name="show_network_speed_summary">Afficher la vitesse du réseau dans la barre de statut</string>
<string name="show_activity_indicators_on_status_bar_title">Indicateur d\'activité réseau</string>
@@ -145,16 +147,16 @@
<string name="button_keys_title">Boutons</string>
<string name="keys_bindings_title">Actions des boutons</string>
<string name="button_keys_back_title" >Bouton Retour</string>
- <string name="button_keys_home_title" >Bouton Home</string>
+ <string name="button_keys_home_title" >Bouton Accueil</string>
<string name="button_keys_menu_title" >Bouton Menu</string>
<string name="button_keys_assist_title" >Bouton Recherche</string>
<string name="button_keys_appSwitch_title" >Bouton Applications récentes</string>
<string name="keys_enable_custom_title">Bouton personnalisé</string>
<string name="keys_back_press_title">Bouton Retour</string>
<string name="keys_back_long_press_title">Bouton Retour (appui long)</string>
- <string name="keys_home_press_title">Bouton Home</string>
- <string name="keys_home_long_press_title">Bouton Home (appui long)</string>
- <string name="keys_home_double_tap_title">Bouton Home (double appui)</string>
+ <string name="keys_home_press_title">Bouton Accueil</string>
+ <string name="keys_home_long_press_title">Bouton Accueil (appui long)</string>
+ <string name="keys_home_double_tap_title">Bouton Accueil (double appui)</string>
<string name="keys_menu_press_title">Bouton Menu</string>
<string name="keys_menu_long_press_title">Bouton Menu (appui long)</string>
<string name="keys_assist_press_title">Bouton de recherche</string>
@@ -167,20 +169,28 @@
<string name="keys_action_search">Assistant de recherche</string>
<string name="keys_action_voice_search">Recherche vocal</string>
<string name="keys_action_in_app_search">Recherche dans l\'application</string>
- <string name="keys_action_home">Bouton Home</string>
+ <string name="keys_action_home">Bouton Accueil</string>
<string name="keys_action_back">Bouton Retour</string>
<string name="keys_action_last_app">Basculer sur la dernière application</string>
<string name="keys_action_kill_app">Tuer l\'application</string>
<string name="keys_action_normal">Appui normal</string>
<string name="keys_action_long">Appui long</string>
<string name="keys_action_double">Double appuis</string>
- <string name="dialog_no_home_key_title">Pas de bouton Home</string>
- <string name="no_home_key">Vous n\'avez pas assigné de bouton à l\'action \"Home\"\u00A0! Cela peut rendre votre appareil inutilisable\u00A0!</string>
+ <string name="dialog_no_home_key_title">Pas de bouton Accueil</string>
+ <string name="no_home_key">Vous n\'avez pas assigné de bouton à l\'action \"Accueil\"\u00A0! Cela peut rendre votre appareil inutilisable\u00A0!</string>
+ <string name="virtual_key_haptic_feedback_title">Vibrer au toucher</string>
+ <string name="virtual_key_haptic_feedback_summary">Cette option dépend de l\'option \"Vibrer au toucher\" des paramètres du son</string>
<string name="bars_and_menus_category_power_menu_title">Menu marche/arrêt</string>
<string name="power_menu_toggle_screenshot_title">Capture d\'écran</string>
<string name="power_menu_toggle_screenshot_summary">Afficher les options de capture d\'écran dans le menu marche/arrêt</string>
<string name="power_menu_toggle_screenrecord_title">Capture vidéo</string>
<string name="power_menu_toggle_screenrecord_summary">Afficher les options de capture vidéo de l\'écran dans le menu marche/arrêt</string>
+ <string name="power_menu_toggle_mobile_data_title">Données mobiles</string>
+ <string name="power_menu_toggle_mobile_data_summary">Afficher les options d\'accès aux données mobiles dans le menu marche/arrêt</string>
+ <string name="power_menu_toggle_airplane_mode_title">Mode avion</string>
+ <string name="power_menu_toggle_airplane_mode_summary">Afficher le mode avion dans le menu marche/arrêt</string>
+ <string name="power_menu_toggle_sound_toggles_title">Son</string>
+ <string name="power_menu_toggle_sound_toggles_summary">Afficher les options du son dans le menu marche/arrêt</string>
<string name="ad_settings_title">ActiveDisplay</string>
<string name="ad_settings_summary">Définir les paramètres d\'ActiveDisplay</string>
<string name="ad_enable_title">Activer</string>
@@ -237,17 +247,84 @@
<string name="show_recent_clear_all_button_title">Bouton de fermeture rapide</string>
<string name="show_recent_clear_all_button_summary">Afficher le bouton de fermeture rapide des applications dans la fenêtre des applications récentes</string>
<string name="recent_clear_all_button_location_title">Position du bouton</string>
- <string name="recent_clear_all_button_location_summary">Définir dans quel coin de l\'écran placer le bouton de fermeture rapide</string>
+ <string name="recent_clear_all_button_location_summary">Définir la position du bouton de fermeture rapide</string>
<string name="recent_clear_all_button_location_top_left">En haut à gauche</string>
<string name="recent_clear_all_button_location_top_right">En haut à droite</string>
<string name="recent_clear_all_button_location_bottom_left">En bas à gauche</string>
- <string name="recent_clear_all_button_location_bottom_right">En bas en droite</string>
+ <string name="recent_clear_all_button_location_bottom_right">En bas à droite</string>
+ <string name="show_recents_memory_indicator_title">Indicateur de mémoire</string>
+ <string name="show_recents_memory_indicator_summary">Afficher l\'indicateur de mémoire dans la fenêtre des applications récentes</string>
+ <string name="recents_memory_indicator_location_title">Position de l\'indicateur</string>
+ <string name="recents_memory_indicator_location_summary">Définir la position de l\'indicateur de mémoire</string>
<string name="notification_drawer_category_title">Barre de notification</string>
<string name="custom_statusbar_header_title">En-tête contextuel</string>
- <string name="custom_statusbar_header_summary">Définir l\'arrière plan de la barre des notifications avec une image basé sur la date et l\'heure courante</string>
+ <string name="custom_statusbar_header_summary">Définir l\'arrière plan de la barre des notifications avec une image basée sur la date et l\'heure courante</string>
<string name="button_volume_default_none">Aucun</string>
<string name="button_volume_default_ringer">Sonnerie</string>
<string name="button_volume_default_media">Média</string>
<string name="button_volume_default_title">Volume par défaut</string>
<string name="button_volume_default_summary">Définir quel volume modifier par défaut</string>
+ <string name="navigation_ring_title">Raccourcis de lancement rapide</string>
+ <string name="navring_target_reset_message">Supprimer tous les raccourcis de la barre de navigation et revenir à la configuration d\'origine\u00A0?</string>
+ <string name="navring_target_reset">Raccourcis de la barre de navigation réinitialisés</string>
+ <string name="navring_action_open_ime_switcher">Changer la méthode de saisie</string>
+ <string name="navring_action_kill_app">Fermer les applications</string>
+ <string name="navring_action_none">Aucun</string>
+ <string name="navring_action_take_screenshot">Effectuer une capture d\'écran</string>
+ <string name="navring_action_ring_vibrate">Sonnerie/Vibreur</string>
+ <string name="navring_action_ring_silent">Sonnerie/Silencieux</string>
+ <string name="navring_action_ring_vibrate_silent">Sonnerie/Vibreur/Silencieux</string>
+ <string name="navring_action_screen_off">Mise en veille</string>
+ <string name="navring_action_torch">Lampe torche</string>
+ <string name="navring_action_google_now">Google Now</string>
+ <string name="navring_choose_action_title">Choisir une action</string>
+ <string name="icon_picker_title">Source de l\'icône</string>
+ <string name="icon_picker_system_icons_title">Icônes système</string>
+ <string name="icon_picker_gallery_title">Galerie</string>
+ <string name="icon_picker_pack_title">Pack d\'icônes</string>
+ <string name="lockscreen_target_info">Glisser pour assigner les raccourcis</string>
+ <string name="lockscreen_target_title">Raccourcis</string>
+ <string name="lockscreen_target_summary">Configurer les raccourcis de l\'écran de verrouillage</string>
+ <string name="lockscreen_target_reset">Les raccourcis ont été réinitialisés</string>
+ <string name="lockscreen_target_reset_title">Réinitialiser</string>
+ <string name="lockscreen_target_reset_message">Supprimer tous les raccourcis et revenir à la configuration d\'origine\u00A0?</string>
+ <string name="lockscreen_target_empty">Vide</string>
+ <string name="lockscreen_target_edit_title">Modifier le raccourci</string>
+ <string name="lockscreen_target_edit_msg">Sélectionner l\'application ou l\'activité et l\'icône associée</string>
+ <string name="picker_activities">Activités</string>
+ <string name="select_custom_app_title">Sélectionner l\'application</string>
+ <string name="select_custom_activity_title">Sélectionner l\'activité</string>
+ <string name="icon_picker_choose_icon_title">Sélectionner une icône</string>
+ <string name="icon_picker_alarm">Alarme</string>
+ <string name="icon_picker_browser">Navigateur</string>
+ <string name="icon_picker_calendar">Agenda</string>
+ <string name="icon_picker_camera">Appareil photo</string>
+ <string name="icon_picker_chrome">Chrome</string>
+ <string name="icon_picker_contacts">Contacts</string>
+ <string name="icon_picker_email">Email</string>
+ <string name="icon_picker_email2">Email Holo</string>
+ <string name="icon_picker_facebook">Facebook</string>
+ <string name="icon_picker_gallery">Galerie</string>
+ <string name="icon_picker_google_small">Google (petit)</string>
+ <string name="icon_picker_googleplus">Google+</string>
+ <string name="icon_picker_googletalk">Hangouts</string>
+ <string name="icon_picker_maps">Google Maps</string>
+ <string name="icon_picker_movie">Vidéos</string>
+ <string name="icon_picker_music">Musique</string>
+ <string name="icon_picker_nav_normal">Navigation</string>
+ <string name="icon_picker_phone">Téléphone</string>
+ <string name="icon_picker_podcast">Podcast</string>
+ <string name="icon_picker_rss">RSS</string>
+ <string name="icon_picker_search">Recherche</string>
+ <string name="icon_picker_sms">Messages</string>
+ <string name="icon_picker_twitter">Twitter</string>
+ <string name="title_quick_pulldown">Accés rapide aux paramètres</string>
+ <string name="summary_quick_pulldown">Accéder rapidement aux paramètres avec un doigt</string>
+ <string name="quick_pulldown_off">Désactivé</string>
+ <string name="quick_pulldown_centre">Centre</string>
+ <string name="quick_pulldown_left">Gauche</string>
+ <string name="quick_pulldown_right">Droite</string>
+ <string name="volume_key_cursor_control_title">Contrôle du curseur</string>
+ <string name="volume_key_cursor_control_on">Gauche/Droite</string>
+ <string name="volume_key_cursor_control_on_reverse">Droite/Gauche</string>
</resources>
diff --git a/res/values/custom_arrays.xml b/res/values/custom_arrays.xml
index 8675a5b..d632f6a 100644
--- a/res/values/custom_arrays.xml
+++ b/res/values/custom_arrays.xml
@@ -108,6 +108,7 @@
<item>@string/keys_action_in_app_search</item>
<item>@string/keys_action_last_app</item>
<item>@string/keys_action_kill_app</item>
+ <item>@string/keys_action_sleep</item>
</string-array>
<string-array name="keys_action_values" translatable="false">
@@ -121,6 +122,7 @@
<item>5</item>
<item>8</item>
<item>9</item>
+ <item>10</item>
</string-array>
<!-- ActiveDisplay Notifications -->
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index c297171..2852531 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -203,6 +203,7 @@
<string name="keys_action_back">Back button</string>
<string name="keys_action_last_app">Switch to last app</string>
<string name="keys_action_kill_app">Kill app</string>
+ <string name="keys_action_sleep">Go to sleep</string>
<string name="keys_action_normal">Normal press</string>
<string name="keys_action_long">Long press</string>
<string name="keys_action_double">Double tap</string>
diff --git a/src/org/omnirom/omnigears/ButtonSettings.java b/src/org/omnirom/omnigears/ButtonSettings.java
index fd2e2b7..2ec08ef 100644
--- a/src/org/omnirom/omnigears/ButtonSettings.java
+++ b/src/org/omnirom/omnigears/ButtonSettings.java
@@ -104,6 +104,7 @@
private static final int ACTION_BACK = 7;
private static final int ACTION_LAST_APP = 8;
private static final int ACTION_KILL_APP = 9;
+ private static final int ACTION_SLEEP = 10;
// Masks for checking presence of hardware keys.
// Must match values in frameworks/base/core/res/res/values/config.xml