diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 15eda7e54..181e63032 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -2141,4 +2141,6 @@
Store wordlists internally
(Not in external/sdcard memory)
+ Go to Settings
+
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
index a9cf68b72..9086fedd2 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
@@ -101,6 +101,7 @@ public class BoardActivity extends XWActivity
private static final int VALUES_ACTION = 16;
private static final int BT_PICK_ACTION = 17;
private static final int SMS_PICK_ACTION = 18;
+ private static final int SMS_CONFIG_ACTION = 19;
private static final String DLG_TITLE = "DLG_TITLE";
private static final String DLG_TITLESTR = "DLG_TITLESTR";
@@ -787,7 +788,7 @@ public class BoardActivity extends XWActivity
case R.id.board_menu_file_prefs:
m_firingPrefs = true;
- startActivity( new Intent( this, PrefsActivity.class ) );
+ Utils.launchSettings( this );
break;
case R.id.board_menu_file_about:
@@ -836,6 +837,10 @@ public class BoardActivity extends XWActivity
GameUtils.launchSMSInviter( this, m_nMissingPlayers,
SMS_INVITE_RESULT );
break;
+ case SMS_CONFIG_ACTION:
+ Utils.launchSettings( this );
+ break;
+
case COMMIT_ACTION:
cmd = JNICmd.CMD_COMMIT;
break;
@@ -1904,7 +1909,9 @@ public class BoardActivity extends XWActivity
switch( m_connType ) {
case COMMS_CONN_SMS:
if ( XWApp.SMSSUPPORTED && !XWPrefs.getSMSEnabled( this ) ) {
- showOKOnlyDialog( R.string.warn_sms_disabled );
+ showConfirmThen( R.string.warn_sms_disabled,
+ R.string.configure,
+ SMS_CONFIG_ACTION );
}
break;
}
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
index c3af5839e..7484dd696 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
@@ -587,8 +587,7 @@ public class GamesList extends XWListActivity
break;
case R.id.gamel_menu_prefs:
- intent = new Intent( this, PrefsActivity.class );
- startActivity( intent );
+ Utils.launchSettings( this );
break;
case R.id.gamel_menu_about:
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
index 8fba347cb..ccec875d7 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
@@ -166,7 +166,7 @@ public class PrefsActivity extends PreferenceActivity
// Now replace this activity with a new copy
// so the new values get loaded.
- startActivity( new Intent( this, PrefsActivity.class ) );
+ Utils.launchSettings( this );
finish();
}
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
index 4a2a77215..b97d82ed5 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
@@ -153,6 +153,11 @@ public class XWActivity extends Activity
m_delegate.showConfirmThen( msg, action );
}
+ protected void showConfirmThen( int msg, int posButton, int action )
+ {
+ m_delegate.showConfirmThen( getString(msg), posButton, action );
+ }
+
public void showEmailOrSMSThen( int action )
{
m_delegate.showEmailOrSMSThen( action );