diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java index b6e384799..18fa82be0 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java @@ -376,9 +376,7 @@ public class BTService extends XWService { Log.d( TAG, "startService(%s); inForeground = %b", intent, inForeground ); if ( ! inForeground && canRunForegroundService() ) { - if ( XWPrefs.getBTBackgroundEnabled( context ) ) { - context.startForegroundService( intent ); - } + context.startForegroundService( intent ); } else if ( inForeground || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) { context.startService( intent ); } else { diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java index 526e26107..09bba0785 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java @@ -56,7 +56,6 @@ public class DlgDelegate { SET_HIDE_NEWGAME_BUTTONS, DWNLD_LOC_DICT, NEW_GAME_DFLT_NAME, - DISABLE_BT_BACK, // BoardDelegate UNDO_LAST_ACTION, diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java index bae29f46e..1079a8afd 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java @@ -1359,10 +1359,6 @@ public class GamesListDelegate extends ListDelegateBase true ); break; - case DISABLE_BT_BACK: - XWPrefs.setBTBackgroundEnabled( m_activity, false ); - break; - default: handled = super.onPosButton( action, params ); } @@ -2274,11 +2270,8 @@ public class GamesListDelegate extends ListDelegateBase private void tryBackgroundIntent( Intent intent ) { if ( intent.getBooleanExtra( BACKGROUND_EXTRA, false ) ) { - ActionPair pair = new ActionPair( Action.DISABLE_BT_BACK, - R.string.disable_bt_back ); makeNotAgainBuilder( R.string.not_again_btservice, R.string.key_notagain_btservice ) - .setActionPair( pair ) .show(); } } diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java index 3262b8fef..55ba5abfe 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java @@ -51,16 +51,6 @@ public class XWPrefs { setPrefsBoolean( context, R.string.key_enable_sms, enabled ); } - public static void setBTBackgroundEnabled( Context context, boolean enabled ) - { - setPrefsBoolean( context, R.string.key_btback_enabled, enabled ); - } - - public static boolean getBTBackgroundEnabled( Context context ) - { - return getPrefsBoolean( context, R.string.key_btback_enabled, true ); - } - public static boolean getDebugEnabled( Context context ) { return getPrefsBoolean( context, R.string.key_enable_debug, false ); diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml index 5d8eef505..389e79ddb 100644 --- a/xwords4/android/app/src/main/res/values/common_rsrc.xml +++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml @@ -61,7 +61,6 @@ key_notify_sound key_disable_relay key_notify_vibrate - key_btback_enabled key_enable_sms key_enable_p2p key_network_behavior diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 64ea01e0b..448076ff7 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -2029,8 +2029,6 @@ Enable WiFi Direct Experimental, uses lots of battery - Enable background Bluetooth - Always listen for Bluetooth messages Accepting Bluetooth messages… @@ -2656,8 +2654,6 @@ Bluetooth moves and invitations while in the foreground, but any sent while it\'s in the background will be lost. - Disable Background - This game has sent no invitations Disable side-by-side diff --git a/xwords4/android/app/src/main/res/xml/xwprefs.xml b/xwords4/android/app/src/main/res/xml/xwprefs.xml index fdb679770..8d6204d6d 100644 --- a/xwords4/android/app/src/main/res/xml/xwprefs.xml +++ b/xwords4/android/app/src/main/res/xml/xwprefs.xml @@ -335,11 +335,6 @@ android:summary="@string/notify_other_summary" android:defaultValue="false" /> -