diff --git a/res/values-cs/custom_strings.xml b/res/values-cs/custom_strings.xml
index 1aa990c..c334a09 100644
--- a/res/values-cs/custom_strings.xml
+++ b/res/values-cs/custom_strings.xml
@@ -370,6 +370,10 @@
     <string name="icon_picker_sms">Zprávy</string>
     <string name="icon_picker_twitter">Twitter</string>
 
+    <!-- QuickSettings: Dynamic Row -->
+    <string name="qs_configurable_title">Konfigurovatelné rychlé nastavení</string>
+    <string name="qs_configurable_summary">Povolit/zakázat dynamické změny řádku</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>
@@ -383,4 +387,12 @@
     <string name="volume_key_cursor_control_on">Doleva/doprava</string>
     <string name="volume_key_cursor_control_on_reverse">Doprava/Doleva</string>
 
+    <!-- Quick Swipe -->
+    <string name="quick_swipe_title">Rychlé přepnutí</string>
+    <string name="quick_swipe_summary">Rychlé přepnutí mezi rychlým nastavením a oznamovací oblasti</string>
+
+    <!-- navigation bar -->
+    <string name="soft_back_kill_app_title">Dlouhým stiskem tlačítka zpět vynutit ukončení aplikace</string>
+    <string name="soft_back_kill_app_summary">Dlouhým stiskem tlačítka zpět vynutíte ukončení aplikace v popředí</string>
+
 </resources>
diff --git a/res/values-fr/custom_strings.xml b/res/values-fr/custom_strings.xml
index 6a6545e..c38ab1a 100644
--- a/res/values-fr/custom_strings.xml
+++ b/res/values-fr/custom_strings.xml
@@ -330,6 +330,11 @@
     <string name="quick_pulldown_centre">Centre</string>
     <string name="quick_pulldown_left">Gauche</string>
     <string name="quick_pulldown_right">Droite</string>
+    <string name="smart_pulldown_title">Déroulement intelligent</string>
+    <string name="smart_pulldown_summary">Ouvrir le panneau des paramètres lorsqu\'aucune notification n\'est présente</string>
+    <string name="smart_pulldown_off">Désactivé</string>
+    <string name="smart_pulldown_dismissable">Si aucune notification</string>
+    <string name="smart_pulldown_persistent">Si aucune notification persistante</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>
diff --git a/res/values-it/custom_strings.xml b/res/values-it/custom_strings.xml
index a4e1c7a..22030e0 100644
--- a/res/values-it/custom_strings.xml
+++ b/res/values-it/custom_strings.xml
@@ -384,4 +384,8 @@
     <!-- Quick Swipe -->
     <string name="quick_swipe_title">Quick Swipe</string>
     <string name="quick_swipe_summary">Scorri rapidamente tra i quick settings e l\'area delle notifiche</string>
+
+    <!-- navigation bar -->
+    <string name="soft_back_kill_app_title">Tasto indietro per chiudere le applicazioni</string>
+    <string name="soft_back_kill_app_summary">Tieni premuto il tasto indietro per chiudere le applicazioni recenti</string>
 </resources>
diff --git a/res/values-zh-rCN/custom_strings.xml b/res/values-zh-rCN/custom_strings.xml
index 07b9c52..5e37101 100644
--- a/res/values-zh-rCN/custom_strings.xml
+++ b/res/values-zh-rCN/custom_strings.xml
@@ -18,11 +18,11 @@
  -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ok">OK</string>
+    <string name="ok">确定</string>
     <string name="reset">重置</string>
 
     <string name="bars_and_menus_settings">状态栏和菜单</string>
-    <string name="active_display_settings">ActiveDisplay</string>
+    <string name="active_display_settings">动态提醒</string>
     <string name="bars_and_menus_category_status_bar_title">状态栏</string>
     <string name="bars_and_menus_category_navigation_bar_title">导航栏</string>
     <string name="status_bar_battery_title">电量图标风格</string>
@@ -42,8 +42,8 @@
     <!-- String for IconPicker -->
     <string name="icon_picker_title">选择图标来源</string>
     <string name="icon_picker_system_icons_title">系统图标</string>
-    <string name="icon_picker_gallery_title">相册Gallery</string>
-    <string name="icon_picker_pack_title">图标包Icon pack</string>
+    <string name="icon_picker_gallery_title">相册</string>
+    <string name="icon_picker_pack_title">图标包</string>
 
     <string name="profile_applist_title">Apps</string>
     <string name="profile_choose_app">选择应用</string>
@@ -59,22 +59,22 @@
     <string name="dialog_delete_title">删除</string>
     <string name="dialog_delete_message">删除以选中条目?</string>
     <string name="dialog_test_message">关闭屏幕以查看选中通知的行为或者关闭此对话框来停止测试</string>
-    <string name="dialog_test_button">取消Dismiss</string>
+    <string name="dialog_test_button">取消</string>
 
     <!-- Lights settings screen, notification light settings -->
     <string name="notification_light_enable">启用</string>
-    <string name="notification_light_general_title">一般General</string>
-    <string name="notification_light_applist_title">应用Applications</string>
-    <string name="notification_light_phonelist_title">电话Phone</string>
-    <string name="notification_light_use_custom">使用定制值Use custom values</string>
-    <string name="notification_light_enabled">启用Enabled</string>
-    <string name="notification_light_disabled">禁用Disabled</string>
-    <string name="notification_light_default_value">默认Default</string>
-    <string name="notification_light_missed_call_title">未接来电Missed call</string>
-    <string name="notification_light_voicemail_title">语音信箱Voicemail</string>
+    <string name="notification_light_general_title">常规</string>
+    <string name="notification_light_applist_title">应用</string>
+    <string name="notification_light_phonelist_title">电话</string>
+    <string name="notification_light_use_custom">使用定制值</string>
+    <string name="notification_light_enabled">启用</string>
+    <string name="notification_light_disabled">禁用</string>
+    <string name="notification_light_default_value">默认</string>
+    <string name="notification_light_missed_call_title">未接来电</string>
+    <string name="notification_light_voicemail_title">语音信箱</string>
 
     <!-- Values for the notification light pulse spinners -->
-    <string name="pulse_length_always_on">总是打开</string>
+    <string name="pulse_length_always_on">总是开启</string>
     <string name="pulse_length_very_short">非常慢</string>
     <string name="pulse_length_short">短</string>
     <string name="pulse_length_normal">正常</string>
@@ -86,31 +86,31 @@
     <string name="pulse_speed_slow">慢</string>
     <string name="pulse_speed_very_slow">非常慢</string>
 
-    <string name="led_color_green">绿</string>
-    <string name="led_color_red">红</string>
+    <string name="led_color_green">绿色</string>
+    <string name="led_color_red">红色</string>
 
     <!-- Battery light settings  -->
     <string name="battery_light_enable">启用</string>
-    <string name="battery_low_pulse_title">电量低时闪动</string>
+    <string name="battery_low_pulse_title">电量低时闪烁</string>
     <string name="battery_light_list_title">颜色</string>
     <string name="battery_light_low_color_title">电量低</string>
     <string name="battery_light_medium_color_title">充电中</string>
-    <string name="battery_light_full_color_title">已充电 (90%)</string>
-    <string name="battery_light_really_full_color_title">已完成 (100%)</string>
+    <string name="battery_light_full_color_title">充电完成 (90%)</string>
+    <string name="battery_light_really_full_color_title">充电完成 (100%)</string>
     <string name="edit_battery_settings">编辑电池设置</string>
 
     <!-- brightness settings -->
-    <string name="brightness_settings_title">亮度设置Brightness setup</string>
-    <string name="screen_current_value">当前屏幕值Current screen value: <xliff:g id="screen_level">%d</xliff:g></string>
-    <string name="button_current_value">当前按键值Current button value: <xliff:g id="button_level">%d</xliff:g></string>
+    <string name="brightness_settings_title">亮度设置</string>
+    <string name="screen_current_value">当前屏幕值: <xliff:g id="screen_level">%d</xliff:g></string>
+    <string name="button_current_value">当前按键值: <xliff:g id="button_level">%d</xliff:g></string>
 
-    <string name="auto_brightness_sensitivity_title">调整灵敏度Adjustment sensitivity</string>
-    <string name="auto_brightness_sensitivity_summary">中Medium</string>
-    <string name="auto_brightness_sensitivity_verylow">非常低Very low</string>
-    <string name="auto_brightness_sensitivity_low">低Low</string>
-    <string name="auto_brightness_sensitivity_medium">中Medium</string>
-    <string name="auto_brightness_sensitivity_high">高High</string>
-    <string name="auto_brightness_sensitivity_veryhigh">非常高Very high</string>
+    <string name="auto_brightness_sensitivity_title">调整灵敏度</string>
+    <string name="auto_brightness_sensitivity_summary">中</string>
+    <string name="auto_brightness_sensitivity_verylow">非常低</string>
+    <string name="auto_brightness_sensitivity_low">低</string>
+    <string name="auto_brightness_sensitivity_medium">中</string>
+    <string name="auto_brightness_sensitivity_high">高</string>
+    <string name="auto_brightness_sensitivity_veryhigh">非常高</string>
 
     <string name="screen_brightness_category">屏幕</string>
     <string name="screen_auto_brightness">自动等级</string>
@@ -118,11 +118,11 @@
     <string name="button_auto_brightness">自动等级</string>
     <string name="button_auto_brighness_summary">自动模式下的按钮亮度等级</string>
     <string name="button_brightness_category">按钮</string>
-    <string name="button_no_brightness">Dark mode</string>
+    <string name="button_no_brightness">全黑模式</string>
     <string name="button_no_brightness_summary">不要设置按钮亮度</string>
-    <string name="button_link_brightness">和屏幕联动</string>
+    <string name="button_link_brightness">与屏幕同步</string>
     <string name="button_link_brightness_summary">按钮亮度会和屏幕亮度值保持一致</string>
-    <string name="button_manual_brightness">手动等级</string>
+    <string name="button_manual_brightness">手动模式下的按钮亮度等级</string>
     <string name="button_manual_brightness_summary">手动模式下的按钮等级</string>
     <string name="dialog_manual_brightness_title">手动设置按钮亮度</string>
     <!-- Automatic brightness customization -->
@@ -138,8 +138,8 @@
     <string name="auto_brightness_level_dialog_title">亮度等级</string>
     <string name="auto_brightness_lux">环境亮度 (lux)</string>
     <string name="auto_brightness_backlight">亮度</string>
-    <string name="auto_brightness_reset_dialog_title">重置等级?Reset levels?</string>
-    <string name="auto_brightness_reset_confirmation">所有亮度等级会被重置到默认值.</string>
+    <string name="auto_brightness_reset_dialog_title">重置等级?</string>
+    <string name="auto_brightness_reset_confirmation">所有亮度等级会被重置到默认值</string>
     <string name="auto_brightness_split_lux_format">切分位置 (位于 <xliff:g id="min">%1$d</xliff:g> 和 <xliff:g id="max">%2$d</xliff:g> lux 之间)</string>
     <string name="auto_brightness_level_options">呼吸灯等级选项</string>
     <string name="auto_brightness_menu_edit">编辑</string>
@@ -151,8 +151,8 @@
         <item quantity="one"><xliff:g id="seconds">%d</xliff:g> 秒</item>
         <item quantity="other"><xliff:g id="seconds">%d</xliff:g> 秒</item>
     </plurals>
-    <string name="button_timeout_enabled">启用 <xliff:g id="timeout">%s</xliff:g></string>
-    <string name="button_timeout_disabled">禁用</string>
+    <string name="button_timeout_enabled">已启用: <xliff:g id="timeout">%s</xliff:g>后超时</string>
+    <string name="button_timeout_disabled">已禁用</string>
     <string name="dialog_button_timeout_title">按键亮度超时时间</string>
 
     <!-- button settings -->
@@ -185,9 +185,9 @@
     <string name="keys_enable_custom_title">自定义行为</string>
     <string name="keys_back_press_title">返回</string>
     <string name="keys_back_long_press_title">返回(长按)</string>
-    <string name="keys_home_press_title">HomeHome key</string>
-    <string name="keys_home_long_press_title">Home(长按)</string>
-    <string name="keys_home_double_tap_title">Home(双击)</string>
+    <string name="keys_home_press_title">Home 键</string>
+    <string name="keys_home_long_press_title">Home (长按)</string>
+    <string name="keys_home_double_tap_title">Home (双击)</string>
     <string name="keys_menu_press_title">菜单</string>
     <string name="keys_menu_long_press_title">菜单(长按)</string>
     <string name="keys_assist_press_title">搜索</string>
@@ -207,8 +207,8 @@
     <string name="keys_action_normal">正常按</string>
     <string name="keys_action_long">长按</string>
     <string name="keys_action_double">双击</string>
-    <string name="dialog_no_home_key_title">没有绑定Home</string>
-    <string name="no_home_key">你为设置任何按键绑定到 \"Home\" 上! 这会导致你的设备无法正常使用!</string>
+    <string name="dialog_no_home_key_title">没有绑定 Home 键</string>
+    <string name="no_home_key">您尚未将任何按键绑定到 Home 键上! 这会导致您的设备无法正常使用! </string>
     <string name="virtual_key_haptic_feedback_title">触摸时震动</string>
     <string name="virtual_key_haptic_feedback_summary">是否开启依赖于声音设置中的 \"触摸时震动\" </string>
 
@@ -218,45 +218,45 @@
     <string name="power_menu_toggle_screenshot_summary">在电源菜单中显示截屏</string>
     <string name="power_menu_toggle_screenrecord_title">屏幕录像</string>
     <string name="power_menu_toggle_screenrecord_summary">在电源菜单中显示屏幕录</string>
-    <string name="power_menu_toggle_mobile_data_title">Mobile Data</string>
-    <string name="power_menu_toggle_mobile_data_summary">Show Mobile Data option in Power Menu</string>
-    <string name="power_menu_toggle_airplane_mode_title">Airplane mode</string>
-    <string name="power_menu_toggle_airplane_mode_summary">Show Airplane option in Power Menu</string>
-    <string name="power_menu_toggle_sound_toggles_title">Sound toggles</string>
-    <string name="power_menu_toggle_sound_toggles_summary">Show sound toggles in Power Menu</string>
+    <string name="power_menu_toggle_mobile_data_title">移动数据</string>
+    <string name="power_menu_toggle_mobile_data_summary">在电源菜单中显示移动数据选项</string>
+    <string name="power_menu_toggle_airplane_mode_title">飞行模式</string>
+    <string name="power_menu_toggle_airplane_mode_summary">在电源菜单中显示飞行模式选项</string>
+    <string name="power_menu_toggle_sound_toggles_title">声音开关</string>
+    <string name="power_menu_toggle_sound_toggles_summary">在电源菜单中显示声音开关</string>
 
     <!-- Active Display Notifications -->
-    <string name="ad_settings_title">Active display</string>
-    <string name="ad_settings_summary">变更active display设置</string>
+    <string name="ad_settings_title">动态提醒</string>
+    <string name="ad_settings_summary">更改动态提醒设置</string>
     <string name="ad_enable_title">启用</string>
-    <string name="ad_enable_summary_on">Active display启用</string>
-    <string name="ad_enable_summary_off">Active display禁用</string>
+    <string name="ad_enable_summary_on">动态提醒已启用</string>
+    <string name="ad_enable_summary_off">动态提醒已禁用</string>
     <string name="ad_text_title">提醒文本</string>
-    <string name="ad_text_summary">在环附近显示提醒文本.</string>
+    <string name="ad_text_summary">在环附近显示提醒文本</string>
     <string name="ad_all_notifications_title">所有提醒</string>
-    <string name="ad_all_notifications_summary">显示所有通知,包括不间断以及不可清除的通知.</string>
+    <string name="ad_all_notifications_summary">显示所有通知,包括不间断以及不可清除的通知</string>
     <string name="ad_hide_low_priority_title">隐藏低优先级</string>
     <string name="ad_hide_low_priority_title">隐藏低优先级</string>
-    <string name="ad_hide_low_priority_summary">隐藏低优先级通知,例如来自Google Now的通知.</string>
+    <string name="ad_hide_low_priority_summary">隐藏低优先级通知,例如来自Google 即时的通知</string>
     <string name="ad_pocket_mode_title">口袋模式</string>
-    <string name="ad_pocket_mode_summary">仅在你将设备拿出口袋之后显示active display通知.</string>
+    <string name="ad_pocket_mode_summary">仅在你将设备拿出口袋之后显示动态提醒通知</string>
     <string name="ad_redisplay_title">重新显示通知</string>
     <string name="ad_timeout_title">显示超时时间</string>
-    <string name="ad_threshold_title">Threshold to proximity</string>
+    <string name="ad_threshold_title">接近阀值</string>
     <string name="ad_brightness_title">通知亮度</string>
     <string name="ad_customizations_title">定制</string>
     <string name="ad_excluded_apps_title">不包括所有应用</string>
-    <string name="ad_excluded_apps_summary">排除应用程序将不会显示在动态显示.</string>
+    <string name="ad_excluded_apps_summary">排除应用程序将不会显示在动态显示</string>
     <string name="ad_show_date_title">显示日期</string>
-    <string name="ad_show_ampm_title">显示AM/PM</string>
+    <string name="ad_show_ampm_title">显示“上午/下午”</string>
     <string name="ad_sunlight_mode_title">阳光模式</string>
-    <string name="ad_brightness_summary">当自动亮度没有启用时,显示通知的亮度等级.</string>
+    <string name="ad_brightness_summary">当自动亮度没有启用时,显示通知的亮度等级</string>
     <string name="ad_show_date_summary">在时钟上显示日期</string>
-    <string name="ad_show_ampm_summary">当使用12小时制时在时间后显示AM/PM</string>
-    <string name="ad_sunlight_mode_summary">当在高亮环境例如阳光直射时反转显示颜色.</string>
-    <string name="ad_turnoff_mode_title">关闭x显示</string>
-    <string name="ad_turnoff_mode_summary">如果设备重新放入后代且被Active Display激活时关闭显示.</string>
-    <string name="ad_redisplay_never">永不</string>
+    <string name="ad_show_ampm_summary">当使用12小时制时在时间后显示“上午/下午”</string>
+    <string name="ad_sunlight_mode_summary">当在高亮环境例如阳光直射时反转显示颜色</string>
+    <string name="ad_turnoff_mode_title">关闭显示</string>
+    <string name="ad_turnoff_mode_summary">如果设备被动态提醒激活后重新放入口袋后将关闭显示</string>
+    <string name="ad_redisplay_never">从不</string>
     <string name="ad_redisplay_1m">1 分钟</string>
     <string name="ad_redisplay_5m">5 分钟</string>
     <string name="ad_redisplay_15m">15 分钟</string>
@@ -306,24 +306,24 @@
     <string name="button_volume_default_none">无</string>
     <string name="button_volume_default_ringer">响铃</string>
     <string name="button_volume_default_media">媒体</string>
-    <string name="button_volume_default_title">音量(默认)</string>
+    <string name="button_volume_default_title">音量 (默认)</string>
     <string name="button_volume_default_summary">默认选择音量改变值</string>
 
     <!-- Navigation ring shortcuts -->
-    <string name="navigation_ring_title">快速启动快捷</string>
-    <string name="navring_target_reset_message">删除所有用户自定义的导航栏快捷且恢复为默认?</string>
-    <string name="navring_target_reset">导航栏快捷重置为默认</string>
-    <string name="navring_action_open_ime_switcher">打开输入法切换</string>
-    <string name="navring_action_kill_app">清除应用</string>
+    <string name="navigation_ring_title">导航栏快捷方式</string>
+    <string name="navring_target_reset_message">确定删除所有用户创建的导航栏快捷方式并还原为默认值？</string>
+    <string name="navring_target_reset">导航栏快捷方式已还原为默认值</string>
+    <string name="navring_action_open_ime_switcher">开启输入法切换器</string>
+    <string name="navring_action_kill_app">终止程序</string>
     <string name="navring_action_none">无</string>
-    <string name="navring_action_take_screenshot">截屏</string>
+    <string name="navring_action_take_screenshot">屏幕截图</string>
     <string name="navring_action_ring_vibrate">响铃/震动</string>
     <string name="navring_action_ring_silent">响铃/静音</string>
     <string name="navring_action_ring_vibrate_silent">响铃/震动/静音</string>
     <string name="navring_action_screen_off">关闭屏幕</string>
-    <string name="navring_action_torch">开关手电</string>
+    <string name="navring_action_torch">手电筒开关</string>
     <string name="navring_action_google_now">Google Now</string>
-    <string name="navring_choose_action_title">选择行为</string>
+    <string name="navring_choose_action_title">选择操作</string>
 
     <!-- String for IconPicker -->
     <string name="icon_picker_title">选择图标来源</string>
@@ -332,20 +332,20 @@
     <string name="icon_picker_pack_title">图标包</string>
 
     <!-- Lock Screen Shortcuts -->
-    <string name="lockscreen_target_info">将滑块拖动到目标来绑定快捷行为</string>
-    <string name="lockscreen_target_title">滑块快捷</string>
-    <string name="lockscreen_target_summary">查看或改变用户定制锁屏快捷</string>
-    <string name="lockscreen_target_reset">锁屏快捷重置成默认</string>
+    <string name="lockscreen_target_info">把滑块拉到指定的位置以选择快捷方式</string>
+    <string name="lockscreen_target_title">锁屏快捷方式</string>
+    <string name="lockscreen_target_summary">查看或改变锁屏界面上的快捷方式</string>
+    <string name="lockscreen_target_reset">锁屏快捷方式已还原为默认值</string>
     <string name="lockscreen_target_reset_title">重置</string>
-    <string name="lockscreen_target_reset_message">删除所有用户自定义的锁屏快捷且恢复为默认?</string>
+    <string name="lockscreen_target_reset_message">删除所有用户设定的快捷方式并还原为默认值?</string>
     <string name="lockscreen_target_empty">空</string>
-    <string name="lockscreen_target_edit_title">编辑快捷和图标</string>
-    <string name="lockscreen_target_edit_msg">选择或改变想要的应用或行为并且指定图标</string>
+    <string name="lockscreen_target_edit_title">编辑快捷方式与图标</string>
+    <string name="lockscreen_target_edit_msg">选定或改变与快捷方式所关联的程序与图标</string>
 
     <!-- Lock screen shortcuts -->
-    <string name="picker_activities">Activities</string>
-    <string name="select_custom_app_title">选择定制应用</string>
-    <string name="select_custom_activity_title">选择定制行为</string>
+    <string name="picker_activities">活动</string>
+    <string name="select_custom_app_title">选择自定义应用</string>
+    <string name="select_custom_activity_title">选择自定义活动</string>
     <string name="icon_picker_choose_icon_title">选择图标</string>
     <string name="icon_picker_alarm">闹钟</string>
     <string name="icon_picker_browser">浏览器</string>
@@ -358,20 +358,30 @@
     <string name="icon_picker_facebook">Facebook</string>
     <string name="icon_picker_gallery">图库</string>
     <string name="icon_picker_google_small">Google (小)</string>
-    <string name="icon_picker_googleplus">Google Plus</string>
+    <string name="icon_picker_googleplus">Google+</string>
     <string name="icon_picker_googletalk">环聊</string>
     <string name="icon_picker_maps">地图</string>
     <string name="icon_picker_movie">电影</string>
     <string name="icon_picker_music">音乐</string>
     <string name="icon_picker_nav_normal">导航</string>
     <string name="icon_picker_phone">电话</string>
-    <string name="icon_picker_podcast">Podcast</string>
-    <string name="icon_picker_rss">Rss</string>
+    <string name="icon_picker_podcast">播客</string>
+    <string name="icon_picker_rss">RSS 订阅</string>
     <string name="icon_picker_search">搜索</string>
     <string name="icon_picker_sms">短信</string>
     <string name="icon_picker_twitter">Twitter</string>
 
-    <!-- Status Bar QS Quick pulldown -->
-    <string name="qs_quick_pulldown_title">下拉快速设置</string>
-    <string name="qs_quick_pulldown_summary">通过拉下状态栏右边进行快速设置</string>
-</resources>
+    <!-- QuickSettings: Quick Pulldown -->
+    <string name="title_quick_pulldown">快速下拉</string>
+    <string name="summary_quick_pulldown">使用单指迅速开启快速设置面板</string>
+    <string name="quick_pulldown_off">关</string>
+    <string name="quick_pulldown_centre">中间</string>
+    <string name="quick_pulldown_left">左边</string>
+    <string name="quick_pulldown_right">右边</string>
+
+   <!-- Cursor control -->
+    <string name="volume_key_cursor_control_title">光标控制</string>
+    <string name="volume_key_cursor_control_on">左/右</string>
+    <string name="volume_key_cursor_control_on_reverse">右/左</string>
+
+ </resources>
diff --git a/res/values/custom_arrays.xml b/res/values/custom_arrays.xml
index d632f6a..dd68836 100644
--- a/res/values/custom_arrays.xml
+++ b/res/values/custom_arrays.xml
@@ -289,6 +289,19 @@
         <item>3</item>
     </string-array>
 
+    <!-- Smart pulldown -->
+    <string-array name="smart_pulldown_entries" translatable="false">
+        <item>@string/smart_pulldown_off</item>
+        <item>@string/smart_pulldown_dismissable</item>
+        <item>@string/smart_pulldown_persistent</item>
+    </string-array>
+
+    <string-array name="smart_pulldown_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
     <!--- Volume key cursor control -->
     <string-array name="volume_key_cursor_control_entries" translatable="false">
         <item>@string/disabled</item>
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index f0a37b4..4d8b168 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -217,15 +217,15 @@
     <!-- Power Menu Options-->
     <string name="bars_and_menus_category_power_menu_title">Power menu</string>
     <string name="power_menu_toggle_screenshot_title">Screenshot</string>
-    <string name="power_menu_toggle_screenshot_summary">Show screenshot option in Power Menu</string>
-    <string name="power_menu_toggle_screenrecord_title">Screen Record</string>
-    <string name="power_menu_toggle_screenrecord_summary">Show screen Record option in Power Menu</string>
-    <string name="power_menu_toggle_mobile_data_title">Mobile Data</string>
-    <string name="power_menu_toggle_mobile_data_summary">Show Mobile Data option in Power Menu</string>
+    <string name="power_menu_toggle_screenshot_summary">Show screenshot option in power menu</string>
+    <string name="power_menu_toggle_screenrecord_title">Screen record</string>
+    <string name="power_menu_toggle_screenrecord_summary">Show screen record option in power menu</string>
+    <string name="power_menu_toggle_mobile_data_title">Mobile data</string>
+    <string name="power_menu_toggle_mobile_data_summary">Show mobile data option in power menu</string>
     <string name="power_menu_toggle_airplane_mode_title">Airplane mode</string>
-    <string name="power_menu_toggle_airplane_mode_summary">Show Airplane option in Power Menu</string>
+    <string name="power_menu_toggle_airplane_mode_summary">Show airplane option in power menu</string>
     <string name="power_menu_toggle_sound_toggles_title">Sound toggles</string>
-    <string name="power_menu_toggle_sound_toggles_summary">Show sound toggles in Power Menu</string>
+    <string name="power_menu_toggle_sound_toggles_summary">Show sound toggles in power menu</string>
 
     <!-- Active Display Notifications -->
     <string name="ad_settings_title">Active display</string>
@@ -234,30 +234,30 @@
     <string name="ad_enable_summary_on">Active display enabled</string>
     <string name="ad_enable_summary_off">Active display disabled</string>
     <string name="ad_text_title">Notification text</string>
-    <string name="ad_text_summary">Show the notification text around the ring.</string>
+    <string name="ad_text_summary">Show the notification text around the ring</string>
     <string name="ad_all_notifications_title">All notifications</string>
-    <string name="ad_all_notifications_summary">Show all notifications including ongoing, non-clearable notifications.</string>
+    <string name="ad_all_notifications_summary">Show all notifications including ongoing, non-clearable notifications</string>
     <string name="ad_hide_low_priority_title">Hide low priority</string>
     <string name="ad_hide_low_priority_title">Hide low priority</string>
-    <string name="ad_hide_low_priority_summary">Hide low priority notifications such as those from Google Now.</string>
+    <string name="ad_hide_low_priority_summary">Hide low priority notifications such as those from Google Now</string>
     <string name="ad_pocket_mode_title">Pocket mode</string>
-    <string name="ad_pocket_mode_summary">Show active display notifications when you take the device out of your pocket.</string>
+    <string name="ad_pocket_mode_summary">Show active display notifications when you take the device out of your pocket</string>
     <string name="ad_redisplay_title">Redisplay notifications</string>
     <string name="ad_timeout_title">Display timeout</string>
     <string name="ad_threshold_title">Threshold to proximity</string>
     <string name="ad_brightness_title">Notification brightness</string>
     <string name="ad_customizations_title">Customizations</string>
     <string name="ad_excluded_apps_title">Excluded applications</string>
-    <string name="ad_excluded_apps_summary">Excluded applications will not show up in active display.</string>
+    <string name="ad_excluded_apps_summary">Excluded applications will not show up in active display</string>
     <string name="ad_show_date_title">Show date</string>
     <string name="ad_show_ampm_title">Show AM/PM</string>
     <string name="ad_sunlight_mode_title">Sunlight mode</string>
-    <string name="ad_brightness_summary">Brightness level for displaying notifications when automatic brightness is not enabled.</string>
+    <string name="ad_brightness_summary">Brightness level for displaying notifications when automatic brightness is not enabled</string>
     <string name="ad_show_date_summary">Show the date above the clock</string>
     <string name="ad_show_ampm_summary">Show AM/PM indicator next to time when using 12hour format</string>
-    <string name="ad_sunlight_mode_summary">Invert the colors when in areas with bright light such as direct sunlight.</string>
+    <string name="ad_sunlight_mode_summary">Invert the colors when in areas with bright light such as direct sunlight</string>
     <string name="ad_turnoff_mode_title">Turn off display</string>
-    <string name="ad_turnoff_mode_summary">Turn off display if the device gets pocketed again and was turned on by Active Display.</string>
+    <string name="ad_turnoff_mode_summary">Turn off display if the device gets pocketed again and was turned on by active display</string>
     <string name="ad_redisplay_never">Never</string>
     <string name="ad_redisplay_1m">1 minute</string>
     <string name="ad_redisplay_5m">5 minutes</string>
@@ -397,6 +397,13 @@
     <string name="quick_pulldown_left">Left</string>
     <string name="quick_pulldown_right">Right</string>
 
+    <!-- QuickSettings: Smart Pulldown -->
+    <string name="smart_pulldown_title">Smart pulldown</string>
+    <string name="smart_pulldown_summary">Open Quick Settings when there are no notifications present</string>
+    <string name="smart_pulldown_off">Off</string>
+    <string name="smart_pulldown_dismissable">Pulldown if there are no cleareable notifications</string>
+    <string name="smart_pulldown_persistent">Pulldown if there are no notifications</string>
+
     <!-- Cursor control -->
     <string name="volume_key_cursor_control_title">Cursor control</string>
     <string name="volume_key_cursor_control_on">Left/right</string>
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index 609b239..2b19990 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -57,6 +57,14 @@
                 android:entryValues="@array/quick_pulldown_values"
                 android:persistent="false" />
 
+        <ListPreference
+                android:key="smart_pulldown"
+                android:title="@string/smart_pulldown_title"
+                android:summary="@string/smart_pulldown_summary"
+                android:entries="@array/smart_pulldown_entries"
+                android:entryValues="@array/smart_pulldown_values"
+                android:persistent="false" />
+
         <CheckBoxPreference
                 android:key="quicksettings_dynamic_row"
                 android:title="@string/qs_configurable_title"
diff --git a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
index bdb8bd0..1bf48a5 100644
--- a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
+++ b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
@@ -33,7 +33,10 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.DisplayInfo;
+import android.view.WindowManager;
 import android.view.WindowManagerGlobal;
 
 public class BarsSettings extends SettingsPreferenceFragment implements
@@ -45,16 +48,23 @@
     private static final String STATUS_BAR_TRAFFIC = "status_bar_traffic";
     private static final String STATUS_BAR_NETWORK_ACTIVITY = "status_bar_network_activity";
     private static final String QUICK_PULLDOWN = "quick_pulldown";
+    private static final String SMART_PULLDOWN = "smart_pulldown";
     private static final String QUICKSETTINGS_DYNAMIC = "quicksettings_dynamic_row";
     private static final String CATEGORY_NAVBAR = "category_navigation_bar";
     private static final String SOFT_BACK_KILL_APP = "soft_back_kill_app";
 
+    // Device types
+    private static final int DEVICE_PHONE  = 0;
+    private static final int DEVICE_HYBRID = 1;
+    private static final int DEVICE_TABLET = 2;
+
     private CheckBoxPreference mStatusBarBrightnessControl;
     private CheckBoxPreference mStatusBarNotifCount;
     private CheckBoxPreference mStatusBarTraffic;
     private CheckBoxPreference mStatusBarNetworkActivity;
     private CheckBoxPreference mQuickSettingsDynamic;
     private ListPreference mQuickPulldown;
+    private ListPreference mSmartPulldown;
     private CheckBoxPreference mSoftBackKillApp;
 
     @Override
@@ -98,10 +108,24 @@
         mStatusBarNetworkActivity.setOnPreferenceChangeListener(this);
 
         mQuickPulldown = (ListPreference) findPreference(QUICK_PULLDOWN);
-        mQuickPulldown.setOnPreferenceChangeListener(this);
-        int statusQuickPulldown =
-                Settings.System.getInt(resolver, Settings.System.QS_QUICK_PULLDOWN,0);
-        mQuickPulldown.setValue(String.valueOf(statusQuickPulldown));
+        mSmartPulldown = (ListPreference) findPreference(SMART_PULLDOWN);
+
+        if (isPhone(getActivity())) {
+            int quickPulldown = Settings.System.getInt(resolver,
+                    Settings.System.QS_QUICK_PULLDOWN, 0);
+            mQuickPulldown.setValue(String.valueOf(quickPulldown));
+            updateQuickPulldownSummary(quickPulldown);
+            mQuickPulldown.setOnPreferenceChangeListener(this);
+
+            int smartPulldown = Settings.System.getInt(resolver,
+                    Settings.System.QS_SMART_PULLDOWN, 0);
+            mSmartPulldown.setValue(String.valueOf(smartPulldown));
+            updateSmartPulldownSummary(smartPulldown);
+            mSmartPulldown.setOnPreferenceChangeListener(this);
+        } else {
+            prefSet.removePreference(mQuickPulldown);
+            prefSet.removePreference(mSmartPulldown);
+        }
 
         mQuickSettingsDynamic = (CheckBoxPreference) prefSet.findPreference(QUICKSETTINGS_DYNAMIC);
         mQuickSettingsDynamic.setChecked(Settings.System.getInt(resolver,
@@ -157,9 +181,15 @@
             Settings.System.putInt(resolver,
                 Settings.System.QUICK_SETTINGS_TILES_ROW, value ? 1 : 0);
         } else if (preference == mQuickPulldown) {
-            int statusQuickPulldown = Integer.valueOf((String) objValue);
+            int quickPulldown = Integer.valueOf((String) objValue);
             Settings.System.putInt(resolver, Settings.System.QS_QUICK_PULLDOWN,
-                    statusQuickPulldown);
+                    quickPulldown);
+            updateQuickPulldownSummary(quickPulldown);
+        } else if (preference == mSmartPulldown) {
+            int smartPulldown = Integer.valueOf((String) objValue);
+            Settings.System.putInt(resolver, Settings.System.QS_SMART_PULLDOWN,
+                    smartPulldown);
+            updateSmartPulldownSummary(smartPulldown);
         } else if (preference == mSoftBackKillApp) {
             boolean value = (Boolean) objValue;
             Settings.System.putInt(resolver,
@@ -182,4 +212,46 @@
         }
         return intState;
     }
+
+    private void updateQuickPulldownSummary(int i) {
+        if (i == 0) {
+            mQuickPulldown.setSummary(R.string.quick_pulldown_off);
+        } else if (i == 1) {
+            mQuickPulldown.setSummary(R.string.quick_pulldown_right);
+        } else if (i == 2) {
+            mQuickPulldown.setSummary(R.string.quick_pulldown_left);
+        } else if (i == 3) {
+            mQuickPulldown.setSummary(R.string.quick_pulldown_centre);
+        }
+    }
+
+    private void updateSmartPulldownSummary(int i) {
+        if (i == 0) {
+            mSmartPulldown.setSummary(R.string.smart_pulldown_off);
+        } else if (i == 1) {
+            mSmartPulldown.setSummary(R.string.smart_pulldown_dismissable);
+        } else if (i == 2) {
+            mSmartPulldown.setSummary(R.string.smart_pulldown_persistent);
+        }
+    }
+
+    private static int getScreenType(Context con) {
+        WindowManager wm = (WindowManager) con.getSystemService(Context.WINDOW_SERVICE);
+        DisplayInfo outDisplayInfo = new DisplayInfo();
+        wm.getDefaultDisplay().getDisplayInfo(outDisplayInfo);
+        int shortSize = Math.min(outDisplayInfo.logicalHeight, outDisplayInfo.logicalWidth);
+        int shortSizeDp =
+            shortSize * DisplayMetrics.DENSITY_DEFAULT / outDisplayInfo.logicalDensityDpi;
+        if (shortSizeDp < 600) {
+            return DEVICE_PHONE;
+        } else if (shortSizeDp < 720) {
+            return DEVICE_HYBRID;
+        } else {
+            return DEVICE_TABLET;
+        }
+    }
+
+    public static boolean isPhone(Context con) {
+        return getScreenType(con) == DEVICE_PHONE;
+    }
 }