diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2015-01-09 01:06:26 +0200 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-01-18 05:09:33 +0200 |
commit | dac5f536bc72335297ffedf03b4cf8ecda6d8013 (patch) | |
tree | 4adb3f64a1c6d1574d5106a6606def924272deb1 | |
parent | 59d51b5fd01b62c3f844a0008072e8f9d45f4328 (diff) | |
download | android_packages_apps_Bluetooth-dac5f536bc72335297ffedf03b4cf8ecda6d8013.tar.gz android_packages_apps_Bluetooth-dac5f536bc72335297ffedf03b4cf8ecda6d8013.tar.bz2 android_packages_apps_Bluetooth-dac5f536bc72335297ffedf03b4cf8ecda6d8013.zip |
Bluetooth: Improve CAF strings
* Also remove Chinese CAF translations
Change-Id: I325da1fa32d91634a240ce3070d4bd7fe75f9f68
-rw-r--r-- | res/values-zh-rCN/strings.xml | 3 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 3 | ||||
-rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java | 16 |
3 files changed, 7 insertions, 15 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 7ef55b35b..f3ea5fc68 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -122,7 +122,4 @@ <string name="bluetooth_map_email_settings_app_icon" msgid="6905622365985483669">"应用图标"</string> <string name="bluetooth_map_email_settings_title" msgid="2181388147513118336">"蓝牙邮件共享设置"</string> <string name="bluetooth_map_email_settings_no_account_slots_left" msgid="5989596869950397488">"无法选择帐户。目前没有任何空档"</string> - <string name="upload_fail_waiting">正在进行数据准备,稍后自动重发</string> - <string name="bluetooth_in_airplane_mode">"正处于飞行模式下"</string> - <string name="empty_file_notification_sent">蓝牙分享:远端拒绝零长度文件 <xliff:g id="file">%1$s</xliff:g></string> </resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index a7c9fff74..b62adaa12 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -19,6 +19,5 @@ <!-- label for the notification if the zero length file is rejected by the remote device --> <string name="empty_file_notification_sent">Bluetooth share: Remote rejected zero length file <xliff:g id="file">%1$s</xliff:g></string> - <string name="upload_fail_waiting">Ongoing send file preparation, automatic retransmission later</string> - <string name="bluetooth_in_airplane_mode">In Airplane mode</string> + <string name="upload_fail_waiting">Unable to send file, retrying\u2026</string> </resources> diff --git a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java index 702822580..86bdadfbf 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java @@ -50,7 +50,6 @@ import android.net.Uri; import android.os.Bundle; import android.util.Log; import android.provider.Settings; -import android.widget.Toast; import android.util.Patterns; import java.util.regex.Matcher; @@ -81,15 +80,7 @@ public class BluetoothOppLauncherActivity extends Activity { finish(); return; } - boolean airplane = (android.provider.Settings.System.getInt - (this.getContentResolver(), android.provider.Settings.System.AIRPLANE_MODE_ON, 0) != 0); - boolean needPrompt = getResources().getBoolean(R.bool.config_airplane_invalid); - if (airplane && needPrompt) { - Toast.makeText(this,R.string.bluetooth_in_airplane_mode, - Toast.LENGTH_SHORT).show(); - finish(); - return; - } + if (action.equals(Intent.ACTION_SEND) || action.equals(Intent.ACTION_SEND_MULTIPLE)) { //Check if Bluetooth is available in the beginning instead of at the end if (!isBluetoothAllowed()) { @@ -241,6 +232,11 @@ public class BluetoothOppLauncherActivity extends Activity { return true; } + final boolean needsPrompt = getResources().getBoolean(R.bool.config_airplane_invalid); + if (needsPrompt) { + return false; + } + // Check if airplane mode matters final String airplaneModeRadios = Settings.System.getString(resolver, Settings.System.AIRPLANE_MODE_RADIOS); |