From 578ece48c8a52b3e079b3a0ed849b88d311cfa5f Mon Sep 17 00:00:00 2001
From: metalnow <shaune.jan@gmail.com>
Date: Wed, 1 Oct 2014 16:06:55 +0800
Subject: [PATCH 01/12] update translation of tranditional chinese

1. update new string
2. revise words
---
 Android/res/values-zh-rTW/strings.xml | 84 ++++++++++++++++-----------
 1 file changed, 49 insertions(+), 35 deletions(-)

diff --git a/Android/res/values-zh-rTW/strings.xml b/Android/res/values-zh-rTW/strings.xml
index 7716002ba4..cf24029ef3 100644
--- a/Android/res/values-zh-rTW/strings.xml
+++ b/Android/res/values-zh-rTW/strings.xml
@@ -65,8 +65,8 @@
     <string name="pref_enable_tts">啟用 TTS 文字轉語音</string>
     <string name="pref_enable_tts_summary">重要的訊息以語音的方式播放</string>
     <string name="pref_request_max_volume">啟動時將音量轉到最大</string>
-    <string name="pref_vehicle_type">無人載具的預設種類</string>
-    <string name="pref_vehicle_type_summary">未連接時無人載具的預設種類</string>
+    <string name="pref_vehicle_type">無人機的預設種類</string>
+    <string name="pref_vehicle_type_summary">未連接時無人機的預設種類</string>
     <string name="pref_rc">遙控界面</string>
     <string name="pref_rc_general">一般</string>
     <string name="pref_rc_mode">遙控模式</string>
@@ -96,8 +96,8 @@
     <string name="about">關於</string>
     <string name="version">版本</string>
     <string name="storage_folder">儲存路徑</string>
-    <string name="pref_live_upload">啟用實況上傳(ALPHA 測試中)</string>
-    <string name="pref_live_upload_summary">上傳無人載具的數據到 Droneshare</string>
+    <string name="pref_live_upload">啟用實況上傳(ALPHA 版測試中)</string>
+    <string name="pref_live_upload_summary">上傳無人機的數據到 Droneshare</string>
 
     <!-- Toast Message -->
     <string name="user_autopan_long_press">長按圖示可啟動地圖中使用者位置置中。</string>
@@ -153,18 +153,18 @@
     <!-- Flight Mode information -->
     <string name="mode_acro">Acro 特技模式 - 飛友可直接控制旋轉速率、飛行姿態</string>
     <string name="mode_althold">Alt Hold 定高模式 - 系統自動油門控制並保持飛行高度。此模式不需要GPS參與</string>
-    <string name="mode_auto">Auto 自動模式 - 執行已儲存在無人載具上的任務</string>
-    <string name="mode_circle">Circle 盤旋模式 - 無人載具以盤旋在興趣點上並朝向盤旋的中心點。此模式需要 GPS 鎖定。</string>
+    <string name="mode_auto">Auto 自動模式 - 執行已儲存在無人機上的任務</string>
+    <string name="mode_circle">Circle 盤旋模式 - 無人機以盤旋在興趣點上並朝向盤旋的中心點。此模式需要 GPS 鎖定。</string>
     <string name="mode_drift">Drift 飄移模式 - 結合橫滾軸(roll)及方向軸(yaw)的控制來提供更自然、更直覺的飛行。此模式需要 GPS 鎖定。</string>
     <string name="mode_guided">Guided 導引模式 - 從地面站進行位置控制。此模式需要 GPS 鎖定。</string>
     <string name="mode_land">Land 降落模式 - 降落在目前的位置。此模式需要 GPS 鎖定。</string>
-    <string name="mode_loiter">Loiter 停懸模式 - 無人載具完全依 GPS 位置航行。</string>
+    <string name="mode_loiter">Loiter 停懸模式 - 無人機完全依 GPS 位置航行。</string>
     <string name="mode_ofloiter">Optical Flow 光流模式 - 將啟用停懸模式保持位置，以光流感測器數據來保持目前高度。</string>
-    <string name="mode_position">Position 定位模式 - 無人載具完全依 GPS 位置航行，並全手動操控油門。</string>
+    <string name="mode_position">Position 定位模式 - 無人機完全依 GPS 位置航行，並全手動操控油門。</string>
     <string name="mode_rtl">RTL 返航 - 飛行至高低高度，返回 家 的位置並且降落。此模式需要 GPS 鎖定。</string>
     <string name="mode_sport">Sport 運動模式 - 飛友可在自動平衡的狀態下，直接控制旋轉速率、飛行姿態。</string>
-    <string name="mode_stabilize">Stabilize 自穩模式 - 讓無人載具保持水平飛行。</string>
-    <string name="mode_poshold">Hybrid 混合模式 - 混合飄移模式及定高模式讓飛行有如"DJI-GPS"的飛行模式。此模式需要 GPS 鎖定。</string>
+    <string name="mode_stabilize">Stabilize 自穩模式 - 讓無人機保持水平飛行。</string>
+    <string name="mode_poshold">PosHold 定位模式 - 為 AC 3.2 以前版本的 Hybrid 混合模式，作用如同 Loiter 停懸模式，並直接反應搖桿的控制。</string>
 
     <!-- Waypoint types -->
     <string name="waypointType_Waypoint">航點</string>
@@ -178,20 +178,20 @@
     <string name="waypointType_Survey">探勘多邊形</string>
 
     <!-- Waypoint info -->
-    <string name="waypointInfo_Land">在目前位置降落無人載具。您必須手動退出自動模式並上鎖馬達。</string>
+    <string name="waypointInfo_Land">在目前位置降落無人機。您必須手動退出自動模式並上鎖馬達。</string>
     <string name="waypointInfo_Generic">一般航點</string>
     <string name="waypointInfo_Loiter">未使用。</string>
     <string name="waypointInfo_LoiterN">盤旋在目前位置的圈數。</string>
     <string name="waypointInfo_LoiterT">停懸在目前位置的秒數，或結束任務並不限時間停懸。</string>
-    <string name="waypointInfo_RTL">解鎖時，將會傳送 家 的位置給無人載具。如果高度參數為 0，返回時會依目前高度或是 DroidPlanner 所定義的高度飛行。</string>
-    <string name="waypointInfo_TakeOff">在執行下一個航點前，無人載具會先從地面升高至預定的高度。</string>
+    <string name="waypointInfo_RTL">解鎖時，將會傳送 家 的位置給無人機。如果高度參數為 0，返回時會依目前高度或是 DroidPlanner 所定義的高度飛行。</string>
+    <string name="waypointInfo_TakeOff">在執行下一個航點前，無人機會先從地面升高至預定的高度。</string>
     <string name="waypointInfo_Waypoint">航行至三維空間的一個位置。可設定時間(以秒為單位)保持位置，再執行下一個任務。</string>
     <string name="waypointInfo_CondAlt">以預定速率爬昇/下降。延遲任務狀態直到達到預定高度。</string>
     <string name="waypointInfo_CondYaw">設定達到目標角度的條件。</string>
     <string name="waypointInfo_CondDistance">延遲任務狀態直到在下一個航點的預定距離內。</string>
     <string name="waypointInfo_SetHome">家 的位置可設定成目前位置，或是指定位置。</string>
     <string name="waypointInfo_SetSpeed">改變速度和(或)油門設定點。如果不需改變速度和油門，請設-1。</string>
-    <string name="waypointInfo_ROI">設定特定的位置及高度為無人載具的目的地，若有裝置相機則會指定目標朝向。</string>
+    <string name="waypointInfo_ROI">設定特定的位置及高度為無人機的目的地，若有裝置相機則會指定目標朝向。</string>
     <string name="waypointInfo_SetJump">重覆航點</string>
 
     <!-- Waypoint editor -->
@@ -249,9 +249,9 @@
 
     <!-- Calibration data progress -->
     <string name="progress_title_uploading">上傳校正數據</string>
-    <string name="progress_desc_uploading">DroidPlanner 正在上傳校正後的數據到無人載具上</string>
+    <string name="progress_desc_uploading">DroidPlanner 正在上傳校正後的數據到無人機上</string>
     <string name="progress_title_downloading">下載校正數據中</string>
-    <string name="progress_desc_downloading">DroidPlanner 正在從無人載具下載校正後的數據。如果系統尚未連接，請按取消。</string>
+    <string name="progress_desc_downloading">DroidPlanner 正在從無人機下載校正後的數據。如果系統尚未連接，請按取消。</string>
 
     <!-- Radio Setup Resource Strings -->
     <string name="setup_radio_title">遙控頻道校正</string>
@@ -269,13 +269,13 @@
 
     <!-- Accelerometer Setup Resource Strings -->
     <string name="setup_imu_title">加速計校正</string>
-    <string name="setup_imu_start">按下校正開始 IMU 的校正程序。在開始校正程序前，請確認無人載具放置在平坦的表面上。</string>
-    <string name="setup_imu_normal">以最小的移動量，將無人載具水平放好，然後按下一步。</string>
-    <string name="setup_imu_left">以最小的移動量，將無人載具左面朝地、右面朝天放好，然後按下一步。</string>
-    <string name="setup_imu_right">以最小的移動量，將無人載具右面朝地、左面朝天放好，然後按下一步。</string>
-    <string name="setup_imu_nosedown">以最小的移動量，將無人載具機頭朝地放好，然後按下一步。</string>
-    <string name="setup_imu_noseup">以最小的移動量，將無人載具機頭朝天放好，然後按下一步。</string>
-    <string name="setup_imu_back">以最小的移動量，將無人載具底面朝天放好，然後按下一步。</string>
+    <string name="setup_imu_start">按下校正開始 IMU 的校正程序。在開始校正程序前，請確認無人機放置在平坦的表面上。</string>
+    <string name="setup_imu_normal">以最小的移動量，將無人機水平放好，然後按下一步。</string>
+    <string name="setup_imu_left">以最小的移動量，將無人機左面朝地、右面朝天放好，然後按下一步。</string>
+    <string name="setup_imu_right">以最小的移動量，將無人機右面朝地、左面朝天放好，然後按下一步。</string>
+    <string name="setup_imu_nosedown">以最小的移動量，將無人機機頭朝地放好，然後按下一步。</string>
+    <string name="setup_imu_noseup">以最小的移動量，將無人機機頭朝天放好，然後按下一步。</string>
+    <string name="setup_imu_back">以最小的移動量，將無人機底面朝天放好，然後按下一步。</string>
     <string name="setup_imu_completed">加速計校正完成。如果校正失敗，請重新校正程序。</string>
     <string name="setup_imu_step">請按校正開始校正程序。</string>
     <string name="setup_imu_timeleft">在指定下一個方向前，剩餘的時間為:</string>
@@ -283,7 +283,7 @@
     <!-- Flight Setup Resource Strings -->
     <string name="setup_fm_title">飛行模式組態</string>
     <string name="setup_fm_side_title">更新飛行模式</string>
-    <string name="setup_fm_side_desc">按下\'發送\'更新飛行模式到無人載具。</string>
+    <string name="setup_fm_side_desc">按下\'發送\'更新飛行模式到無人機。</string>
     <string name="setup_fm_desc_uploading">上傳飛行模式組態資料中</string>
     <string name="setup_fm_desc_downloading">下載飛行模式組態資料中</string>
     <string name="setup_fm_mode1">1。</string>
@@ -298,7 +298,7 @@
     <!-- Channel Options Setup Resource Strings -->
     <string name="setup_ch_title">頻道選項組態</string>
     <string name="setup_ch_side_title">更新頻道選項</string>
-    <string name="setup_ch_side_desc">按下\'發送\'更新伺服機功能到無人載具上。</string>
+    <string name="setup_ch_side_desc">按下\'發送\'更新伺服機功能到無人機上。</string>
     <string name="setup_ch_tune_title">頻道 6 - 調整參數功能</string>
     <string name="setup_ch_options_title">頻道選項 - 頻道7 &amp; 頻道8</string>
     <string name="setup_ch_CH7_options">頻道 7 選項:</string>
@@ -310,7 +310,7 @@
     <!-- Servo functions Setup Resource Strings -->
     <string name="setup_sf_title">伺服機功能組態</string>
     <string name="setup_sf_side_title">更新伺服機功能</string>
-    <string name="setup_sf_side_desc">按下\'發送\'更新伺服機功能到無人載具上。</string>
+    <string name="setup_sf_side_desc">按下\'發送\'更新伺服機功能到無人機上。</string>
     <string name="setup_sf_desc_uploading">上傳伺服機組態資料中</string>
     <string name="setup_sf_desc_downloading">下載伺服機組態資料中</string>
     <string name="setup_sf_servo_title">伺服機功能組態</string>
@@ -332,11 +332,15 @@
     <string name="default_angle_value">--°</string>
     <string name="mission_control_control">控制</string>
     <string name="mission_control_edit">編輯</string>
-    <string name="mission_control_home">回 家</string>
+    <string name="mission_control_home">回家</string>
+    <string name="mission_control_arm">解鎖</string>
+    <string name="mission_control_disarm">上鎖</string>
     <string name="mission_control_land">降落</string>
     <string name="mission_control_takeoff">起飛</string>
     <string name="mission_control_loiter">停懸</string>
+    <string name="mission_control_auto">自動</string>
     <string name="mission_control_follow">跟隨</string>
+    <string name="mission_control_dronie">自拍</string>
     <string name="telemetry_label">數傳</string>
     <string name="flight_modes_label">飛行模式</string>
     <string name="menu_info_bar">訊息列</string>
@@ -363,10 +367,10 @@
     <!-- Text To Speech -->
     <string name="pref_title_tts">語音輸出</string>
     <string name="pref_title_tts_periodic">定期</string>
-    <string name="pref_title_tts_periodic_status">定期報告設定</string>
+    <string name="pref_title_tts_periodic_status">定期廣播設定</string>
     <string name="pref_tts_periodic_summary">有哪些包含在定期報告中。</string>
     <string name="pref_tts_periodic_period">週期</string>
-    <string name="pref_tts_periodic_period_summary">多久報告一次。</string>
+    <string name="pref_tts_periodic_period_summary">多久廣播一次。</string>
     <string name="pref_tts_periodic_bat_volt">電池伏特數</string>
     <string name="pref_tts_periodic_bat_volt_summary">回報電池伏特數值。</string>
     <string name="pref_tts_periodic_alt">高度</string>
@@ -375,7 +379,7 @@
     <string name="pref_tts_periodic_rssi_summary">回報接收的信號強度指數。</string>
     <string name="pref_tts_periodic_airspeed">空速</string>
     <string name="pref_tts_periodic_airspeed_summary">回報空速數值。</string>
-    <string name="pref_title_tts_warnings">警告</string>
+    <string name="pref_title_tts_warnings">警訊設定</string>
     <string name="pref_tts_warning_solar_activity">日冕活躍中</string>
     <string name="pref_tts_warning_solar_activity_summary">這個警訊是關於目前太陽日冕正發生大爆發，有影響 gps 準確度的可能。</string>
     <string name="pref_tts_warning_wind_speed">風速</string>
@@ -388,9 +392,13 @@
     <string name="pref_tts_warning_lost_signal_summary">當與無人機連線中斷或恢復時所發生的提醒。</string>
     <string name="pref_tts_warning_autopilot_warnings">飛控回報的警訊</string>
     <string name="pref_tts_warning_autopilot_warnings_summary">有關解鎖失敗、低電量、等等。</string>
+    <string name="pref_tts_periodic_status_disabled">廣播已關閉</string>
+    <string name="pref_tts_status_every">每幾秒廣播數據</string>
+    <string name="pref_tts_seconds">秒</string>
+    <string name="pref_tts_off">關閉</string>
     
     <!-- Droneshare -->
-    <string name="dsheader">你有興趣使用免費的服務平台 www.Droneshare.com 嗎？</string>
+    <string name="dsheader">你有興趣使用免費的無人機社群服務 www.Droneshare.com 嗎？</string>
     <string name="dsinfo">Droneshare 是一個免費的平台，你可以在平台上分析或者是分享飛行數據。</string>
     <string name="create_a_new_account">創建一個帳號</string>
     <string name="login_to_an_existing_account">登入帳號</string>
@@ -428,7 +436,7 @@
     <!-- Others (when possible move to a grouping above) -->
     <string name="tune_roll">手動調整 roll 和 pitch 參數。Rate_P 是主要調整的數值。</string>
     <string name="dialog_box_title_altitude">高度</string>
-    <string name="mode_switch">指定遙控器的第5頻道去切換飛行模式。切換開關到每一個位置去指定下列的飛行模式。</string>
+    <string name="mode_switch">指定遙控器的第 5 頻道切換飛行模式。切換開關到每一個位置以指定下列的飛行模式。</string>
     <string name="MAVLinkError">MAVLink 錯誤:</string>
     <string name="msg_connect_first">請先連線</string>
     <string name="mode1_throttle_on_right_stick">模式 1(日本手):油門在右邊的遙桿</string>
@@ -439,6 +447,7 @@
     <string name="normal_waypoint_toggle">一般</string>
     <string name="spline_waypoint_toggle">非線性</string>
     <string name="mavlink_version">Mavlink 版本</string>
+    <string name="firmware_version">韌體版本</string>
     <string name="empty_content">--</string>
     <string name="usage_statistics">統計使用習慣</string>
     <string name="pref_usage_statistics_title">發送使用習慣統計</string>
@@ -447,9 +456,9 @@
     <string name="pref_permanent_notification_title">啟用通知</string>
     <string name="pref_permanent_notification_summary">當連線時，在狀態列上顯示通知內容。</string>
 
-    <string name="zoom_fit">符合顯示范圍</string>
+    <string name="zoom_fit">符合顯示範圍</string>
     <string name="open_mission_file">打開任務檔</string>
-    <string name="save_mission_file">儲存任務到檔案</string>
+    <string name="save_mission_file">儲存任務檔</string>
 
     <string name="pref_ui_gps_hdop_summary">在訊息列上顯示衛星的 HDOP 值代替 FIX 值</string>
     <string name="pref_ui_gps_hdop_title">顯示衛星的 HDOP 值</string>
@@ -459,5 +468,10 @@
     
     <!-- Help -->
     <string name="help_item_description">如何設定和實際操作任務，請點我看影片</string>
-
+    <string name="mission_item_title_takeoff">起飛</string>
+    <string name="label_advaned">進階設定</string>
+    <string name="label_steps_count">階層數</string>
+    <string name="label_altitude_step">階層高段</string>
+    <string name="menu_search_toggle">切換搜尋</string>
+    
 </resources>

From b92cb18f8dfa4601f4e01681854f166e1d8ab6c3 Mon Sep 17 00:00:00 2001
From: Shaune <shaune.jan@gmail.com>
Date: Wed, 1 Oct 2014 20:32:10 +0800
Subject: [PATCH 02/12] word update

---
 Android/res/values-zh-rTW/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android/res/values-zh-rTW/strings.xml b/Android/res/values-zh-rTW/strings.xml
index cf24029ef3..31ca791722 100644
--- a/Android/res/values-zh-rTW/strings.xml
+++ b/Android/res/values-zh-rTW/strings.xml
@@ -471,7 +471,7 @@
     <string name="mission_item_title_takeoff">起飛</string>
     <string name="label_advaned">進階設定</string>
     <string name="label_steps_count">階層數</string>
-    <string name="label_altitude_step">階層高段</string>
+    <string name="label_altitude_step">階層高度</string>
     <string name="menu_search_toggle">切換搜尋</string>
     
 </resources>

From 975a13f4aca8e8b30fb9e81b6c508f9e082c376f Mon Sep 17 00:00:00 2001
From: metalnow <shaune.jan@gmail.com>
Date: Thu, 2 Oct 2014 10:19:11 +0800
Subject: [PATCH 03/12] add new translation for motor disarm

---
 Android/res/values-zh-rTW/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Android/res/values-zh-rTW/strings.xml b/Android/res/values-zh-rTW/strings.xml
index 31ca791722..6595d78d6b 100644
--- a/Android/res/values-zh-rTW/strings.xml
+++ b/Android/res/values-zh-rTW/strings.xml
@@ -473,5 +473,7 @@
     <string name="label_steps_count">階層數</string>
     <string name="label_altitude_step">階層高度</string>
     <string name="menu_search_toggle">切換搜尋</string>
+    <string name="dialog_confirm_arming_title">馬達解鎖嗎？</string>
+    <string name="dialog_confirm_arming_msg">注意！螺旋槳將會開始轉動，無人機也會開始起飛程序。</string>
     
 </resources>

From 1d0bddb2dbaf80515d7ac1451c19c18f46d5a1cd Mon Sep 17 00:00:00 2001
From: metalnow <shaune.jan@gmail.com>
Date: Thu, 2 Oct 2014 15:07:24 +0800
Subject: [PATCH 04/12] cht update

---
 Android/res/values-zh-rTW/strings.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Android/res/values-zh-rTW/strings.xml b/Android/res/values-zh-rTW/strings.xml
index 6595d78d6b..8a9afcd8fc 100644
--- a/Android/res/values-zh-rTW/strings.xml
+++ b/Android/res/values-zh-rTW/strings.xml
@@ -367,19 +367,19 @@
     <!-- Text To Speech -->
     <string name="pref_title_tts">語音輸出</string>
     <string name="pref_title_tts_periodic">定期</string>
-    <string name="pref_title_tts_periodic_status">定期廣播設定</string>
+    <string name="pref_title_tts_periodic_status">語音廣播設定</string>
     <string name="pref_tts_periodic_summary">有哪些包含在定期報告中。</string>
     <string name="pref_tts_periodic_period">週期</string>
     <string name="pref_tts_periodic_period_summary">多久廣播一次。</string>
     <string name="pref_tts_periodic_bat_volt">電池伏特數</string>
-    <string name="pref_tts_periodic_bat_volt_summary">回報電池伏特數值。</string>
+    <string name="pref_tts_periodic_bat_volt_summary">廣播電池伏特數值。</string>
     <string name="pref_tts_periodic_alt">高度</string>
-    <string name="pref_tts_periodic_alt_summary">回報高度值。</string>
+    <string name="pref_tts_periodic_alt_summary">廣播高度值。</string>
     <string name="pref_tts_periodic_rssi">信號強度(RSSI)</string>
-    <string name="pref_tts_periodic_rssi_summary">回報接收的信號強度指數。</string>
+    <string name="pref_tts_periodic_rssi_summary">廣播接收的信號強度指數。</string>
     <string name="pref_tts_periodic_airspeed">空速</string>
-    <string name="pref_tts_periodic_airspeed_summary">回報空速數值。</string>
-    <string name="pref_title_tts_warnings">警訊設定</string>
+    <string name="pref_tts_periodic_airspeed_summary">廣播空速數值。</string>
+    <string name="pref_title_tts_warnings">警訊廣播設定</string>
     <string name="pref_tts_warning_solar_activity">日冕活躍中</string>
     <string name="pref_tts_warning_solar_activity_summary">這個警訊是關於目前太陽日冕正發生大爆發，有影響 gps 準確度的可能。</string>
     <string name="pref_tts_warning_wind_speed">風速</string>
@@ -393,8 +393,8 @@
     <string name="pref_tts_warning_autopilot_warnings">飛控回報的警訊</string>
     <string name="pref_tts_warning_autopilot_warnings_summary">有關解鎖失敗、低電量、等等。</string>
     <string name="pref_tts_periodic_status_disabled">廣播已關閉</string>
-    <string name="pref_tts_status_every">每幾秒廣播數據</string>
-    <string name="pref_tts_seconds">秒</string>
+    <string name="pref_tts_status_every">每</string>
+    <string name="pref_tts_seconds">秒廣播</string>
     <string name="pref_tts_off">關閉</string>
     
     <!-- Droneshare -->
@@ -473,7 +473,7 @@
     <string name="label_steps_count">階層數</string>
     <string name="label_altitude_step">階層高度</string>
     <string name="menu_search_toggle">切換搜尋</string>
-    <string name="dialog_confirm_arming_title">馬達解鎖嗎？</string>
+    <string name="dialog_confirm_arming_title">解鎖馬達嗎？</string>
     <string name="dialog_confirm_arming_msg">注意！螺旋槳將會開始轉動，無人機也會開始起飛程序。</string>
     
 </resources>

From 18ce7b7e8a66333397cb24bfae9143793a8537be Mon Sep 17 00:00:00 2001
From: Arthur Benemann <arthur.benemann@gmail.com>
Date: Thu, 2 Oct 2014 10:37:43 -0700
Subject: [PATCH 05/12] Android: Create a button for doing a takeoff into AUTO

---
 Android/res/layout/fragment_mission_control.xml   |  6 ++++++
 .../android/fragments/FlightActionsFragment.java  | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Android/res/layout/fragment_mission_control.xml b/Android/res/layout/fragment_mission_control.xml
index 3305df3ee0..575b3d8914 100644
--- a/Android/res/layout/fragment_mission_control.xml
+++ b/Android/res/layout/fragment_mission_control.xml
@@ -68,6 +68,12 @@
             android:drawableTop="@drawable/ic_takeoff"
             android:text="@string/mission_control_takeoff"
             />
+        
+        <Button
+            android:id="@+id/mc_TakeoffInAutoBtn"
+            style="@style/flightControlButton.Row"
+            android:drawableTop="@drawable/ic_auto"
+            android:text="@string/mission_control_auto"/>
 
     </LinearLayout>
 
diff --git a/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java b/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
index 2d9a94f5b7..0fd115c785 100644
--- a/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
@@ -27,6 +27,8 @@
 
 public class FlightActionsFragment extends Fragment implements OnClickListener, OnDroneListener {
 
+	private static final double TAKEOFF_ALTITUDE = 10.0;
+
 	public interface OnMissionControlInteraction {
 		public void onJoystickSelected();
 	}
@@ -90,8 +92,11 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
         loiterBtn = (Button) view.findViewById(R.id.mc_loiter);
 		loiterBtn.setOnClickListener(this);
 
-        autoBtn = (Button) view.findViewById(R.id.mc_autoBtn);
+		autoBtn = (Button) view.findViewById(R.id.mc_autoBtn);
 		autoBtn.setOnClickListener(this);
+		
+		final Button takeoffInAuto = (Button) view.findViewById(R.id.mc_TakeoffInAutoBtn);
+		takeoffInAuto.setOnClickListener(this);
 
         followBtn = (Button) view.findViewById(R.id.mc_follow);
 		followBtn.setOnClickListener(this);
@@ -141,7 +146,7 @@ public void onClick(View v) {
 			break;
 
 		case R.id.mc_takeoff:
-			drone.getState().doTakeoff(new Altitude(10.0));
+			drone.getState().doTakeoff(new Altitude(TAKEOFF_ALTITUDE));
 			eventBuilder.setAction("Changed flight mode").setLabel("Takeoff");
 			break;
 
@@ -159,6 +164,12 @@ public void onClick(View v) {
 			drone.getState().changeFlightMode(ApmModes.ROTOR_AUTO);
 			eventBuilder.setAction("Changed flight mode").setLabel(ApmModes.ROTOR_AUTO.getName());
 			break;
+			
+		case R.id.mc_TakeoffInAutoBtn:
+			drone.getState().doTakeoff(new Altitude(TAKEOFF_ALTITUDE));
+			drone.getState().changeFlightMode(ApmModes.ROTOR_AUTO);
+			eventBuilder.setAction("Changed flight mode").setLabel(ApmModes.ROTOR_AUTO.getName());
+			break;
 
 		case R.id.mc_follow:
 			final int result = followMe.toggleFollowMeState();

From d4ec391747e1227ffb432dd1ddce484ba05c80cd Mon Sep 17 00:00:00 2001
From: Arthur Benemann <arthur.benemann@gmail.com>
Date: Thu, 2 Oct 2014 10:42:36 -0700
Subject: [PATCH 06/12] Core: Switch to Loiter on disarm if landing on RTL or
 LAND

Fix issue #1108
---
 Core/src/org/droidplanner/core/drone/variables/State.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/droidplanner/core/drone/variables/State.java b/Core/src/org/droidplanner/core/drone/variables/State.java
index bf32db25c7..ec2104f32a 100644
--- a/Core/src/org/droidplanner/core/drone/variables/State.java
+++ b/Core/src/org/droidplanner/core/drone/variables/State.java
@@ -86,7 +86,9 @@ public void setArmed(boolean newState) {
 			if (newState) {
 				myDrone.getWaypointManager().getWaypoints();
 			}else{
-				changeFlightMode(ApmModes.ROTOR_LOITER);  // When disarming set the mode back to loiter so we can do a takeoff in the future.
+				if (mode == ApmModes.ROTOR_RTL | mode == ApmModes.ROTOR_LAND) {
+					changeFlightMode(ApmModes.ROTOR_LOITER);  // When disarming set the mode back to loiter so we can do a takeoff in the future.					
+				}
 			}
 		}
 	}

From 12ec1622808803131a89fdd8db0c2b9c6169f70c Mon Sep 17 00:00:00 2001
From: Arthur Benemann <arthur.benemann@gmail.com>
Date: Thu, 2 Oct 2014 11:30:55 -0700
Subject: [PATCH 07/12] Android: Renaming the flight action LOITER button to
 STOP

---
 .../drawable-hdpi/{ic_loiter.png => ic_pause.png}   | Bin
 .../drawable-mdpi/{ic_loiter.png => ic_pause.png}   | Bin
 .../drawable-xhdpi/{ic_loiter.png => ic_pause.png}  | Bin
 Android/res/layout/fragment_mission_control.xml     |   6 +++---
 Android/res/values-de/strings.xml                   |   1 -
 Android/res/values-zh-rCN/strings.xml               |   1 -
 Android/res/values-zh-rTW/strings.xml               |   1 -
 Android/res/values/strings.xml                      |   2 +-
 .../android/fragments/FlightActionsFragment.java    |  10 +++++-----
 9 files changed, 9 insertions(+), 12 deletions(-)
 rename Android/res/drawable-hdpi/{ic_loiter.png => ic_pause.png} (100%)
 rename Android/res/drawable-mdpi/{ic_loiter.png => ic_pause.png} (100%)
 rename Android/res/drawable-xhdpi/{ic_loiter.png => ic_pause.png} (100%)

diff --git a/Android/res/drawable-hdpi/ic_loiter.png b/Android/res/drawable-hdpi/ic_pause.png
similarity index 100%
rename from Android/res/drawable-hdpi/ic_loiter.png
rename to Android/res/drawable-hdpi/ic_pause.png
diff --git a/Android/res/drawable-mdpi/ic_loiter.png b/Android/res/drawable-mdpi/ic_pause.png
similarity index 100%
rename from Android/res/drawable-mdpi/ic_loiter.png
rename to Android/res/drawable-mdpi/ic_pause.png
diff --git a/Android/res/drawable-xhdpi/ic_loiter.png b/Android/res/drawable-xhdpi/ic_pause.png
similarity index 100%
rename from Android/res/drawable-xhdpi/ic_loiter.png
rename to Android/res/drawable-xhdpi/ic_pause.png
diff --git a/Android/res/layout/fragment_mission_control.xml b/Android/res/layout/fragment_mission_control.xml
index 3305df3ee0..ae02f57014 100644
--- a/Android/res/layout/fragment_mission_control.xml
+++ b/Android/res/layout/fragment_mission_control.xml
@@ -110,12 +110,12 @@
             tools:ignore="ContentDescription"/>
 
         <Button
-            android:id="@+id/mc_loiter"
+            android:id="@+id/mc_pause"
             style="@style/flightControlButton.Row"
             android:layout_width="75dp"
             android:layout_height="match_parent"
-            android:drawableTop="@drawable/ic_loiter"
-            android:text="@string/mission_control_loiter"
+            android:drawableTop="@drawable/ic_pause"
+            android:text="@string/mission_control_pause"
             android:layout_weight="1"
             tools:ignore="ContentDescription"/>
 
diff --git a/Android/res/values-de/strings.xml b/Android/res/values-de/strings.xml
index dfd0e67529..fa7a1ea310 100644
--- a/Android/res/values-de/strings.xml
+++ b/Android/res/values-de/strings.xml
@@ -316,7 +316,6 @@
     <string name="mission_control_home">Start</string>
     <string name="mission_control_land">Landen</string>
     <string name="mission_control_takeoff">Abheben</string>
-    <string name="mission_control_loiter">Loiter</string>
     <string name="mission_control_follow">Folgen</string>
 
     <!-- Bluetooth device selection strings -->
diff --git a/Android/res/values-zh-rCN/strings.xml b/Android/res/values-zh-rCN/strings.xml
index 6fd28d441c..f41aa948c6 100644
--- a/Android/res/values-zh-rCN/strings.xml
+++ b/Android/res/values-zh-rCN/strings.xml
@@ -319,7 +319,6 @@
     <string name="mission_control_home">回家</string>
     <string name="mission_control_land">降落</string>
     <string name="mission_control_takeoff">起飞</string>
-    <string name="mission_control_loiter">悬停</string>
     <string name="mission_control_follow">跟随</string>
     <string name="telemetry_label">遥测</string>
     <string name="flight_modes_label">飞行模式</string>
diff --git a/Android/res/values-zh-rTW/strings.xml b/Android/res/values-zh-rTW/strings.xml
index 8a9afcd8fc..b429b31c51 100644
--- a/Android/res/values-zh-rTW/strings.xml
+++ b/Android/res/values-zh-rTW/strings.xml
@@ -337,7 +337,6 @@
     <string name="mission_control_disarm">上鎖</string>
     <string name="mission_control_land">降落</string>
     <string name="mission_control_takeoff">起飛</string>
-    <string name="mission_control_loiter">停懸</string>
     <string name="mission_control_auto">自動</string>
     <string name="mission_control_follow">跟隨</string>
     <string name="mission_control_dronie">自拍</string>
diff --git a/Android/res/values/strings.xml b/Android/res/values/strings.xml
index 0d99621f45..76f6fa630e 100644
--- a/Android/res/values/strings.xml
+++ b/Android/res/values/strings.xml
@@ -344,7 +344,7 @@
     <string name="mission_control_disarm">Disarm</string>
     <string name="mission_control_land">Land</string>
     <string name="mission_control_takeoff">Takeoff</string>
-    <string name="mission_control_loiter">Loiter</string>
+    <string name="mission_control_pause">Pause</string>
     <string name="mission_control_auto">Auto</string>
     <string name="mission_control_follow">Follow</string>    
     <string name="mission_control_dronie">Dronie</string>
diff --git a/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java b/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
index 2d9a94f5b7..f450880ca8 100644
--- a/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
@@ -44,7 +44,7 @@ public interface OnMissionControlInteraction {
     private Button followBtn;
     private Button homeBtn;
     private Button landBtn;
-    private Button loiterBtn;
+    private Button pauseBtn;
     private Button autoBtn;
 
 	@Override
@@ -87,8 +87,8 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
         final Button takeoffBtn = (Button) view.findViewById(R.id.mc_takeoff);
 		takeoffBtn.setOnClickListener(this);
 
-        loiterBtn = (Button) view.findViewById(R.id.mc_loiter);
-		loiterBtn.setOnClickListener(this);
+        pauseBtn = (Button) view.findViewById(R.id.mc_pause);
+		pauseBtn.setOnClickListener(this);
 
         autoBtn = (Button) view.findViewById(R.id.mc_autoBtn);
 		autoBtn.setOnClickListener(this);
@@ -150,7 +150,7 @@ public void onClick(View v) {
 			eventBuilder.setAction("Changed flight mode").setLabel(ApmModes.ROTOR_RTL.getName());
 			break;
 
-		case R.id.mc_loiter:
+		case R.id.mc_pause:
 			drone.getState().changeFlightMode(ApmModes.ROTOR_LOITER);
 			eventBuilder.setAction("Changed flight mode").setLabel(ApmModes.ROTOR_LOITER.getName());
 			break;
@@ -273,7 +273,7 @@ private void updateFlightModeButtons() {
     private void resetFlightModeButtons() {
         homeBtn.setActivated(false);
         landBtn.setActivated(false);
-        loiterBtn.setActivated(false);
+        pauseBtn.setActivated(false);
         autoBtn.setActivated(false);
     }
 

From f30cb9d829c84f6495f4e5a58a7cd49dcd1f09af Mon Sep 17 00:00:00 2001
From: Arthur Benemann <arthur.benemann@gmail.com>
Date: Thu, 2 Oct 2014 11:32:46 -0700
Subject: [PATCH 08/12] Core: Add the ability to pause at the current location

---
 .../core/drone/variables/GuidedPoint.java            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java b/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java
index edf5cb35a5..4b8549073c 100644
--- a/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java
+++ b/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java
@@ -48,6 +48,14 @@ public void onDroneEvent(DroneEventsType event, Drone drone) {
 		}
 	}
 
+	public void pauseAtCurrentLocation() {
+		if (state !=GuidedStates.ACTIVE) {
+			myDrone.getState().changeFlightMode(ApmModes.ROTOR_GUIDED);
+		}else{
+			newGuidedCoord(myDrone.getGps().getPosition());
+		}
+	}
+
 	public void doGuidedTakeoff(Altitude alt) {
 		coord = myDrone.getGps().getPosition();
 		altitude.set(alt.valueInMeters());
@@ -166,6 +174,10 @@ public Altitude getAltitude() {
 	public boolean isActive() {
 		return (state == GuidedStates.ACTIVE);
 	}
+	
+	public boolean isIdle() {
+		return (state == GuidedStates.IDLE);
+	}
 
 	public boolean isInitialized() {
 		return !(state == GuidedStates.UNINITIALIZED);

From 42894fea67ee6ab5c6ac52376717b48e1ba665b9 Mon Sep 17 00:00:00 2001
From: Arthur Benemann <arthur.benemann@gmail.com>
Date: Thu, 2 Oct 2014 11:33:43 -0700
Subject: [PATCH 09/12] Android: Make the pause button stop the copter via
 GUIDED instead of switching to Loiter

---
 .../android/fragments/FlightActionsFragment.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java b/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
index f450880ca8..62b2c50e61 100644
--- a/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
@@ -151,8 +151,8 @@ public void onClick(View v) {
 			break;
 
 		case R.id.mc_pause:
-			drone.getState().changeFlightMode(ApmModes.ROTOR_LOITER);
-			eventBuilder.setAction("Changed flight mode").setLabel(ApmModes.ROTOR_LOITER.getName());
+			drone.getGuidedPoint().pauseAtCurrentLocation();
+			eventBuilder.setAction("Changed flight mode").setLabel("Pause");
 			break;
 
 		case R.id.mc_autoBtn:
@@ -256,9 +256,11 @@ private void updateFlightModeButtons() {
                 autoBtn.setActivated(true);
                 break;
 
-            case ROTOR_LOITER:
-                loiterBtn.setActivated(true);
-                break;
+		case ROTOR_GUIDED:
+			if (drone.getGuidedPoint().isIdle()) {
+				pauseBtn.setActivated(true);				
+			}
+			break;
 
             case ROTOR_RTL:
                 homeBtn.setActivated(true);

From 4b2e9b08ffcf95723a71a140adb8723c13d6ffef Mon Sep 17 00:00:00 2001
From: Arthur Benemann <arthur.benemann@gmail.com>
Date: Thu, 2 Oct 2014 11:34:08 -0700
Subject: [PATCH 10/12] Android: Formatting source

---
 .../fragments/FlightActionsFragment.java      | 187 +++++++++---------
 1 file changed, 94 insertions(+), 93 deletions(-)

diff --git a/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java b/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
index 62b2c50e61..de9b62b0d5 100644
--- a/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java
@@ -36,16 +36,16 @@ public interface OnMissionControlInteraction {
 
 	private Follow followMe;
 
-    private View mDisconnectedButtons;
-    private View mDisarmedButtons;
-    private View mArmedButtons;
-    private View mInFlightButtons;
+	private View mDisconnectedButtons;
+	private View mDisarmedButtons;
+	private View mArmedButtons;
+	private View mInFlightButtons;
 
-    private Button followBtn;
-    private Button homeBtn;
-    private Button landBtn;
-    private Button pauseBtn;
-    private Button autoBtn;
+	private Button followBtn;
+	private Button homeBtn;
+	private Button landBtn;
+	private Button pauseBtn;
+	private Button autoBtn;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -61,42 +61,42 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 	public void onViewCreated(View view, Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
 
-        mDisconnectedButtons = view.findViewById(R.id.mc_disconnected_buttons);
-        mDisarmedButtons = view.findViewById(R.id.mc_disarmed_buttons);
-        mArmedButtons = view.findViewById(R.id.mc_armed_buttons);
-        mInFlightButtons = view.findViewById(R.id.mc_in_flight_buttons);
+		mDisconnectedButtons = view.findViewById(R.id.mc_disconnected_buttons);
+		mDisarmedButtons = view.findViewById(R.id.mc_disarmed_buttons);
+		mArmedButtons = view.findViewById(R.id.mc_armed_buttons);
+		mInFlightButtons = view.findViewById(R.id.mc_in_flight_buttons);
 
 		final Button joystickBtn = (Button) view.findViewById(R.id.mc_joystickBtn);
 		joystickBtn.setOnClickListener(this);
 
-        final Button connectBtn = (Button) view.findViewById(R.id.mc_connectBtn);
+		final Button connectBtn = (Button) view.findViewById(R.id.mc_connectBtn);
 		connectBtn.setOnClickListener(this);
 
-        homeBtn = (Button) view.findViewById(R.id.mc_homeBtn);
+		homeBtn = (Button) view.findViewById(R.id.mc_homeBtn);
 		homeBtn.setOnClickListener(this);
 
-        final Button armBtn = (Button) view.findViewById(R.id.mc_armBtn);
+		final Button armBtn = (Button) view.findViewById(R.id.mc_armBtn);
 		armBtn.setOnClickListener(this);
 
-        final Button disarmBtn = (Button) view.findViewById(R.id.mc_disarmBtn);
+		final Button disarmBtn = (Button) view.findViewById(R.id.mc_disarmBtn);
 		disarmBtn.setOnClickListener(this);
 
-        landBtn = (Button) view.findViewById(R.id.mc_land);
+		landBtn = (Button) view.findViewById(R.id.mc_land);
 		landBtn.setOnClickListener(this);
 
-        final Button takeoffBtn = (Button) view.findViewById(R.id.mc_takeoff);
+		final Button takeoffBtn = (Button) view.findViewById(R.id.mc_takeoff);
 		takeoffBtn.setOnClickListener(this);
 
-        pauseBtn = (Button) view.findViewById(R.id.mc_pause);
+		pauseBtn = (Button) view.findViewById(R.id.mc_pause);
 		pauseBtn.setOnClickListener(this);
 
-        autoBtn = (Button) view.findViewById(R.id.mc_autoBtn);
+		autoBtn = (Button) view.findViewById(R.id.mc_autoBtn);
 		autoBtn.setOnClickListener(this);
 
-        followBtn = (Button) view.findViewById(R.id.mc_follow);
+		followBtn = (Button) view.findViewById(R.id.mc_follow);
 		followBtn.setOnClickListener(this);
 
-        final Button dronieBtn = (Button) view.findViewById(R.id.mc_dronieBtn);
+		final Button dronieBtn = (Button) view.findViewById(R.id.mc_dronieBtn);
 		dronieBtn.setOnClickListener(this);
 
 		drone.addDroneListener(this);
@@ -126,8 +126,8 @@ public void onClick(View v) {
 			break;
 
 		case R.id.mc_armBtn:
-            getArmingConfirmation();
-            eventBuilder.setAction("Changed flight mode").setLabel("Arm");
+			getArmingConfirmation();
+			eventBuilder.setAction("Changed flight mode").setLabel("Arm");
 			break;
 
 		case R.id.mc_disarmBtn:
@@ -190,7 +190,7 @@ public void onClick(View v) {
 				Toast.makeText(getActivity(), eventLabel, Toast.LENGTH_SHORT).show();
 			}
 			break;
-			
+
 		case R.id.mc_dronieBtn:
 			drone.getMission().makeAndUploadDronie();
 			eventBuilder.setAction("Dronie").setLabel("Dronie");
@@ -206,24 +206,23 @@ public void onClick(View v) {
 
 	}
 
-    private void getArmingConfirmation() {
-        YesNoDialog ynd = YesNoDialog.newInstance(getString(R.string.dialog_confirm_arming_title),
-                getString(R.string.dialog_confirm_arming_msg),
-                new YesNoDialog.Listener() {
-                    @Override
-                    public void onYes() {
-                        MavLinkArm.sendArmMessage(drone, true);
-                    }
+	private void getArmingConfirmation() {
+		YesNoDialog ynd = YesNoDialog.newInstance(getString(R.string.dialog_confirm_arming_title),
+				getString(R.string.dialog_confirm_arming_msg), new YesNoDialog.Listener() {
+					@Override
+					public void onYes() {
+						MavLinkArm.sendArmMessage(drone, true);
+					}
 
-                    @Override
-                    public void onNo() {
-                    }
-                });
+					@Override
+					public void onNo() {
+					}
+				});
 
-        ynd.show(getChildFragmentManager(), "Confirm arming");
-    }
+		ynd.show(getChildFragmentManager(), "Confirm arming");
+	}
 
-    @Override
+	@Override
 	public void onDroneEvent(DroneEventsType event, Drone drone) {
 		switch (event) {
 		case ARMING:
@@ -233,64 +232,66 @@ public void onDroneEvent(DroneEventsType event, Drone drone) {
 			setupButtonsByFlightState();
 			break;
 
-            case MODE:
-                updateFlightModeButtons();
-                break;
+		case MODE:
+			updateFlightModeButtons();
+			break;
 
-            case FOLLOW_START:
-            case FOLLOW_STOP:
-                updateFollowButton();
-                break;
+		case FOLLOW_START:
+		case FOLLOW_STOP:
+			updateFollowButton();
+			break;
 
 		default:
 			break;
 		}
 	}
 
-    private void updateFlightModeButtons() {
-        resetFlightModeButtons();
+	private void updateFlightModeButtons() {
+		resetFlightModeButtons();
 
-        final ApmModes flightMode = drone.getState().getMode();
-        switch(flightMode){
-            case ROTOR_AUTO:
-                autoBtn.setActivated(true);
-                break;
+		final ApmModes flightMode = drone.getState().getMode();
+		switch (flightMode) {
+		case ROTOR_AUTO:
+			autoBtn.setActivated(true);
+			break;
 
 		case ROTOR_GUIDED:
 			if (drone.getGuidedPoint().isIdle()) {
-				pauseBtn.setActivated(true);				
+				pauseBtn.setActivated(true);
 			}
 			break;
 
-            case ROTOR_RTL:
-                homeBtn.setActivated(true);
-                break;
-
-            case ROTOR_LAND:
-                landBtn.setActivated(true);
-                break;
-        }
-    }
-
-    private void resetFlightModeButtons() {
-        homeBtn.setActivated(false);
-        landBtn.setActivated(false);
-        pauseBtn.setActivated(false);
-        autoBtn.setActivated(false);
-    }
-
-    private void updateFollowButton() {
-        followBtn.setActivated(followMe.isEnabled());
-    }
-
-    private void resetButtonsContainerVisibility(){
-        mDisconnectedButtons.setVisibility(View.GONE);
-        mDisarmedButtons.setVisibility(View.GONE);
-        mArmedButtons.setVisibility(View.GONE);
-        mInFlightButtons.setVisibility(View.GONE);
-    }
-
-    private void setupButtonsByFlightState() {
+		case ROTOR_RTL:
+			homeBtn.setActivated(true);
+			break;
+
+		case ROTOR_LAND:
+			landBtn.setActivated(true);
+			break;
+		default:
+			break;
+		}
+	}
+
+	private void resetFlightModeButtons() {
+		homeBtn.setActivated(false);
+		landBtn.setActivated(false);
+		pauseBtn.setActivated(false);
+		autoBtn.setActivated(false);
+	}
+
+	private void updateFollowButton() {
+		followBtn.setActivated(followMe.isEnabled());
+	}
+
+	private void resetButtonsContainerVisibility() {
+		mDisconnectedButtons.setVisibility(View.GONE);
+		mDisarmedButtons.setVisibility(View.GONE);
+		mArmedButtons.setVisibility(View.GONE);
+		mInFlightButtons.setVisibility(View.GONE);
+	}
+
+	private void setupButtonsByFlightState() {
 		if (drone.getMavClient().isConnected()) {
 			if (drone.getState().isArmed()) {
 				if (drone.getState().isFlying()) {
@@ -307,23 +308,23 @@ private void setupButtonsByFlightState() {
 	}
 
 	private void setupButtonsForDisconnected() {
-        resetButtonsContainerVisibility();
-        mDisconnectedButtons.setVisibility(View.VISIBLE);
+		resetButtonsContainerVisibility();
+		mDisconnectedButtons.setVisibility(View.VISIBLE);
 	}
 
 	private void setupButtonsForDisarmed() {
-        resetButtonsContainerVisibility();
-        mDisarmedButtons.setVisibility(View.VISIBLE);
+		resetButtonsContainerVisibility();
+		mDisarmedButtons.setVisibility(View.VISIBLE);
 	}
 
 	private void setupButtonsForArmed() {
-        resetButtonsContainerVisibility();
-        mArmedButtons.setVisibility(View.VISIBLE);
+		resetButtonsContainerVisibility();
+		mArmedButtons.setVisibility(View.VISIBLE);
 	}
 
 	private void setupButtonsForFlying() {
-        resetButtonsContainerVisibility();
-        mInFlightButtons.setVisibility(View.VISIBLE);
+		resetButtonsContainerVisibility();
+		mInFlightButtons.setVisibility(View.VISIBLE);
 	}
 
 }

From dec7283828036c1c591834722b88a34d3b2fc6b5 Mon Sep 17 00:00:00 2001
From: Arthur Benemann <arthur.benemann@gmail.com>
Date: Thu, 2 Oct 2014 11:44:38 -0700
Subject: [PATCH 11/12] Core: Replaced possible bug in logic expression

It was a bitwise OR before, when it should have been a logic OR
---
 Core/src/org/droidplanner/core/drone/variables/State.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/droidplanner/core/drone/variables/State.java b/Core/src/org/droidplanner/core/drone/variables/State.java
index ec2104f32a..89e831fe9c 100644
--- a/Core/src/org/droidplanner/core/drone/variables/State.java
+++ b/Core/src/org/droidplanner/core/drone/variables/State.java
@@ -86,7 +86,7 @@ public void setArmed(boolean newState) {
 			if (newState) {
 				myDrone.getWaypointManager().getWaypoints();
 			}else{
-				if (mode == ApmModes.ROTOR_RTL | mode == ApmModes.ROTOR_LAND) {
+				if (mode == ApmModes.ROTOR_RTL || mode == ApmModes.ROTOR_LAND) {
 					changeFlightMode(ApmModes.ROTOR_LOITER);  // When disarming set the mode back to loiter so we can do a takeoff in the future.					
 				}
 			}

From c224f55fd8ec5855fb533f3154d5029f64c4ec26 Mon Sep 17 00:00:00 2001
From: Arthur Benemann <arthur.benemann@gmail.com>
Date: Thu, 2 Oct 2014 13:15:17 -0700
Subject: [PATCH 12/12] Version: Releasing version 2.7.10

---
 Android/AndroidManifest.xml | 2 +-
 ChangeLog.md                | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml
index 5f2d0691d8..dbf839ee18 100644
--- a/Android/AndroidManifest.xml
+++ b/Android/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
           package="org.droidplanner"
-          android:versionCode="101"
+          android:versionCode="102"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk
diff --git a/ChangeLog.md b/ChangeLog.md
index fbee5316ab..247735d9f3 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -8,6 +8,12 @@ Our convention for release control is the following (for a release like DPvA.B.C
 All the changes are logged below (preferable with the pull request numbers in parenteses):
 
 # Releases
+## Droidplanner v2.7.10
+* Fixed "Pause" button, for when flying with GCS only (#1116)
+* Switch to Loiter on disarm if landing on RTL or LAND (#1114)
+* Autonomus flight takeoff (#1115)
+* Improved Chinese translation (#1113)
+
 ## Droidplanner v2.7.9
 * UI clean-up (#1106,#1093,#1092,#891,#1110,#1101)
 * Display consumed mAh in status bar (#1111,#1069)