am a01ab9e5: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'a01ab9e5763b16e89239f40a56edfee5f0c8fa75':
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 3304e32..b79d20a 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -91,7 +91,7 @@
<item msgid="1634960474403853625">"Déconnecté"</item>
<item msgid="746097431216080650">"Échec"</item>
<item msgid="6367044185730295334">"Bloqué"</item>
- <item msgid="503942654197908005">"Évite momentanément une mauvaise connexion"</item>
+ <item msgid="503942654197908005">"Mauvaise connexion évitée momentanément"</item>
</string-array>
<string-array name="wifi_status_with_ssid">
<item msgid="7714855332363650812"></item>
@@ -105,7 +105,7 @@
<item msgid="197508606402264311">"Déconnecté"</item>
<item msgid="8578370891960825148">"Échec"</item>
<item msgid="5660739516542454527">"Bloqué"</item>
- <item msgid="1805837518286731242">"Évite momentanément une mauvaise connexion"</item>
+ <item msgid="1805837518286731242">"Mauvaise connexion évitée momentanément"</item>
</string-array>
<!-- no translation found for wifi_security:0 (8491993170197127709) -->
<!-- no translation found for wifi_security:1 (6524315248437318854) -->
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index 36bc7c8..6f4a765 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -64,17 +64,17 @@
return false;
}
+ // If Bluetooth Settings is visible
+ if (manager.isForegroundActivity()) {
+ return true;
+ }
+
// If in appliance mode, do not show dialog in foreground.
if ((context.getResources().getConfiguration().uiMode &
Configuration.UI_MODE_TYPE_APPLIANCE) == Configuration.UI_MODE_TYPE_APPLIANCE) {
return false;
}
- // If Bluetooth Settings is visible
- if (manager.isForegroundActivity()) {
- return true;
- }
-
long currentTimeMillis = System.currentTimeMillis();
SharedPreferences sharedPreferences = getSharedPreferences(context);