diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml index a51b14b3b..1d3026435 100644 --- a/xwords4/android/XWords4/res/values/common_rsrc.xml +++ b/xwords4/android/XWords4/res/values/common_rsrc.xml @@ -24,7 +24,6 @@ key_clr_tile_back key_clr_empty key_clr_crosshairs - key_board_theme key_relay_host key_relay_port2 key_proxy_port @@ -81,11 +80,6 @@ @string/robot_smart - - @string/black_on_white - @string/white_on_black - - @string/connect_thirty_seconds @string/connect_five_mins diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index dd12ab02f..3dd337056 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -284,9 +284,6 @@ Tile background Empty cell/background Crosshairs color - Board color schemes - Dark background - Light background Advanced You may never need these... diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml index 875b579c1..db1dfbd45 100644 --- a/xwords4/android/XWords4/res/xml/xwprefs.xml +++ b/xwords4/android/XWords4/res/xml/xwprefs.xml @@ -64,12 +64,6 @@ android:summary="@string/hide_title_summary" android:defaultValue="true" /> - m_keys; - private String m_boardThemeKey; private String m_keyEmpty; - private String m_whiteOnBlack; - private String m_blackOnWhite; @Override protected Dialog onCreateDialog( int id ) @@ -123,7 +120,6 @@ public class PrefsActivity extends PreferenceActivity R.string.key_initial_player_minutes, R.string.key_default_dict, R.string.key_default_phonies, - R.string.key_board_theme, }; SharedPreferences sp @@ -135,10 +131,7 @@ public class PrefsActivity extends PreferenceActivity setSummary( sp, key ); m_keys.add( key ); } - m_boardThemeKey = getString( R.string.key_board_theme ); m_keyEmpty = getString( R.string.key_empty ); - m_whiteOnBlack = getString( R.string.white_on_black ); - m_blackOnWhite = getString( R.string.black_on_white ); } @Override @@ -162,26 +155,6 @@ public class PrefsActivity extends PreferenceActivity if ( m_keys.contains( key ) ) { setSummary( sp, key ); } - - // Change those color elements that follow the "themes" -- - // currently only key_empty - while ( m_boardThemeKey.equals( key ) ) { // while allows break - String newValue = sp.getString( key, "" ); - - int color; - if ( m_whiteOnBlack.equals( newValue ) ) { - color = 0xFF000000; - } else if ( m_blackOnWhite.equals( newValue ) ) { - color = 0xFFFFFFFF; - } else { - break; - } - - SharedPreferences.Editor editor = sp.edit(); - editor.putInt( m_keyEmpty, color ); - editor.commit(); - break; - } } @Override