diff --git a/xwords4/android/XWords4/res/layout/prefs_w_buttons.xml b/xwords4/android/XWords4/res/layout/prefs_w_buttons.xml
new file mode 100644
index 000000000..a3260e6ff
--- /dev/null
+++ b/xwords4/android/XWords4/res/layout/prefs_w_buttons.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xwords4/android/XWords4/res/menu/prefs_menu.xml b/xwords4/android/XWords4/res/menu/prefs_menu.xml
deleted file mode 100644
index 29f797ed5..000000000
--- a/xwords4/android/XWords4/res/menu/prefs_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 5bd5f32a3..762ea549f 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -797,13 +797,13 @@
-->
- Restore all
+ Restore all
Are you sure you want to
restore all color settings to their original values?
- Restore colors
+ Restore colors
Are you sure you want to restore
all settings to their original values?
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 a9a65aad7..b39453d6b 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
@@ -19,19 +19,16 @@
*/
package org.eehouse.android.xw4;
-import android.preference.PreferenceActivity;
-import android.app.Dialog;
import android.app.AlertDialog;
-import android.content.Intent;
+import android.app.Dialog;
+import android.preference.PreferenceActivity;
import android.content.DialogInterface;
-import android.os.Bundle;
+import android.content.Intent;
import android.content.SharedPreferences;
-import android.preference.Preference;
+import android.os.Bundle;
import android.preference.PreferenceManager;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuInflater;
-import java.util.HashSet;
+import android.view.View;
+import android.widget.Button;
public class PrefsActivity extends PreferenceActivity
implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -112,8 +109,22 @@ public class PrefsActivity extends PreferenceActivity
// Load the preferences from an XML resource
addPreferencesFromResource( R.xml.xwprefs );
+ setContentView( R.layout.prefs_w_buttons );
m_keyLogging = getString( R.string.key_logging_on );
+
+ Button button = (Button)findViewById( R.id.revert_colors );
+ button.setOnClickListener( new View.OnClickListener() {
+ public void onClick( View v ) {
+ showDialog( REVERT_COLORS );
+ }
+ } );
+ button = (Button)findViewById( R.id.revert_all );
+ button.setOnClickListener(new View.OnClickListener() {
+ public void onClick( View v ) {
+ showDialog( REVERT_ALL );
+ }
+ } );
}
@Override
@@ -139,34 +150,6 @@ public class PrefsActivity extends PreferenceActivity
}
}
- @Override
- public boolean onCreateOptionsMenu( Menu menu )
- {
- MenuInflater inflater = getMenuInflater();
- inflater.inflate( R.menu.prefs_menu, menu );
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected( MenuItem item )
- {
- int dlgID = 0;
- switch ( item.getItemId() ) {
- case R.id.menu_revert_all:
- dlgID = REVERT_ALL;
- break;
- case R.id.menu_revert_colors:
- dlgID = REVERT_COLORS;
- break;
- }
-
- boolean handled = 0 != dlgID;
- if ( handled ) {
- showDialog( dlgID );
- }
- return handled;
- }
-
private void relaunch()
{
PreferenceManager.setDefaultValues( this, R.xml.xwprefs,