Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-03 23:04:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't insert rowid in any prefs list except the right one

Browse source
This commit is contained in:
Eric House 2013-11-08 06:31:20 -08:00
parent 0a3a1623df
commit 9f6baf39c4
3 changed files with 57 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/res/xml/xwprefs.xml
View file

@ -134,7 +134,7 @@
/>
</PreferenceScreen>
<org.eehouse.android.xw4.XWListPreference
<org.eehouse.android.xw4.XWSumListPreference
android:key="@string/key_summary_field"
android:title="@string/summary_field"
android:entries="@array/game_summary_values"

16
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListPreference.java
View file

@ -27,7 +27,7 @@ import android.util.AttributeSet;
import junit.framework.Assert;
public class XWListPreference extends ListPreference {
private Context m_context;
protected Context m_context;
public XWListPreference( Context context, AttributeSet attrs )
{
@ -39,20 +39,6 @@ public class XWListPreference extends ListPreference {
{
super.onAttachedToActivity();
setSummary( getPersistedString( "" ) );
if ( XWPrefs.getDebugEnabled( m_context ) ) {
CharSequence[] entries = getEntries();
String lastRow
= m_context.getString( R.string.game_summary_field_rowid );
if ( !entries[entries.length - 1].equals( lastRow ) ) {
CharSequence[] newEntries = new CharSequence[1 + entries.length];
System.arraycopy( entries, 0, newEntries, 0, entries.length );
newEntries[entries.length] = lastRow;
setEntries( newEntries );
setEntryValues( newEntries );
}
}
}
protected boolean persistString( String value )

55
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java Normal file
View file

@ -0,0 +1,55 @@
/* -*- compile-command: "cd ../../../../../; ant debug install"; -*- */
/*
* Copyright 2010 - 2011 by Eric House (xwords@eehouse.org). All
* rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package org.eehouse.android.xw4;
import android.content.Context;
import android.util.AttributeSet;
public class XWSumListPreference extends XWListPreference {
public XWSumListPreference( Context context, AttributeSet attrs )
{
super( context, attrs );
}
// Why I exist: insert the rowid line if debug is on
protected void onAttachedToActivity()
{
super.onAttachedToActivity();
if ( XWPrefs.getDebugEnabled( m_context ) ) {
CharSequence[] entries = getEntries();
String lastRow
= m_context.getString( R.string.game_summary_field_rowid );
if ( !entries[entries.length - 1].equals( lastRow ) ) {
CharSequence[] newEntries =
new CharSequence[1 + entries.length];
System.arraycopy( entries, 0, newEntries, 0,
entries.length );
newEntries[entries.length] = lastRow;
setEntries( newEntries );
setEntryValues( newEntries );
}
}
}
}