PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7b065464: Move BT settings appliance check after foreground check.

Browse Source 
* commit '7b065464c996b792c1ecdd9d8c93db1bf0538b8d':
  Move BT settings appliance check after foreground check.
This commit is contained in:
Justin Koh
2012-08-01 10:59:34 -07:00
committed by Android Git Automerger
parent 74b8a51d97 7b065464c9
commit 0962a5cf35
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
View File

@@ -64,17 +64,17 @@ final class LocalBluetoothPreferences {
return false; return false;
} }
// If Bluetooth Settings is visible
if (manager.isForegroundActivity()) {
return true;
}
// If in appliance mode, do not show dialog in foreground. // If in appliance mode, do not show dialog in foreground.
if ((context.getResources().getConfiguration().uiMode & if ((context.getResources().getConfiguration().uiMode &
Configuration.UI_MODE_TYPE_APPLIANCE) == Configuration.UI_MODE_TYPE_APPLIANCE) { Configuration.UI_MODE_TYPE_APPLIANCE) == Configuration.UI_MODE_TYPE_APPLIANCE) {
return false; return false;
} }
// If Bluetooth Settings is visible
if (manager.isForegroundActivity()) {
return true;
}
long currentTimeMillis = System.currentTimeMillis(); long currentTimeMillis = System.currentTimeMillis();
SharedPreferences sharedPreferences = getSharedPreferences(context); SharedPreferences sharedPreferences = getSharedPreferences(context);