diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2015-01-09 01:06:26 +0200 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-03-14 23:47:22 -0700 |
commit | 629d23ccda05d5ab8268a10db7ca4ec843f30e7f (patch) | |
tree | 5062b01a85c255c38dabdc0ee7a265e5aef9fb27 /src | |
parent | 5093bb2a7a8ae1d6f1c4d44bce1abf07d5d72880 (diff) | |
download | android_packages_apps_Bluetooth-629d23ccda05d5ab8268a10db7ca4ec843f30e7f.tar.gz android_packages_apps_Bluetooth-629d23ccda05d5ab8268a10db7ca4ec843f30e7f.tar.bz2 android_packages_apps_Bluetooth-629d23ccda05d5ab8268a10db7ca4ec843f30e7f.zip |
Bluetooth: Improve CAF strings
* Also remove Chinese CAF translations
Change-Id: I325da1fa32d91634a240ce3070d4bd7fe75f9f68
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java | 16 |
1 files changed, 6 insertions, 10 deletions
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); |