diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index 4fae56116..1074cabd5 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -2181,4 +2181,7 @@ NFC is turned off on this device. Use the Android Settings app to turn it on . Launch Settings + + This setting is ignored on devices + like yours that depend on the \"Action bar\". 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 484c9b077..7bed3b2cb 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java @@ -19,13 +19,15 @@ */ package org.eehouse.android.xw4; + import android.app.AlertDialog; import android.app.Dialog; -import android.preference.PreferenceActivity; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.CheckBoxPreference; +import android.preference.PreferenceActivity; import android.preference.PreferenceManager; import android.view.View; import android.widget.Button; @@ -37,6 +39,7 @@ public class PrefsActivity extends PreferenceActivity private static final int REVERT_COLORS = 1; private static final int REVERT_ALL = 2; public static final int CONFIRM_SMS = 3; + public static final int EXPLAIN_TITLE = 4; private String m_keyLogging; private String m_smsToasting; @@ -44,6 +47,7 @@ public class PrefsActivity extends PreferenceActivity private String m_downloadPath; private String m_thumbEnabled; private String m_thumbSize; + private String m_hideTitle; @Override @@ -100,6 +104,13 @@ public class PrefsActivity extends PreferenceActivity case CONFIRM_SMS: dialog = SMSCheckBoxPreference.onCreateDialog( this, id ); break; + case EXPLAIN_TITLE: + dialog = new AlertDialog.Builder( this ) + .setMessage( R.string.no_hide_titlebar ) + .setTitle( R.string.info_title ) + .setPositiveButton( R.string.button_ok, null ) + .create(); + break; } if ( null == dialog && null != lstnr ) { @@ -128,6 +139,7 @@ public class PrefsActivity extends PreferenceActivity m_downloadPath = getString( R.string.key_download_path ); m_thumbEnabled = getString( R.string.key_thumb_enabled ); m_thumbSize = getString( R.string.key_thumbsize ); + m_hideTitle = getString( R.string.key_hide_title ); Button button = (Button)findViewById( R.id.revert_colors ); button.setOnClickListener( new View.OnClickListener() { @@ -193,7 +205,15 @@ public class PrefsActivity extends PreferenceActivity } else if ( key.equals( m_thumbEnabled ) || key.equals( m_thumbSize ) ) { DBUtils.clearThumbnails( this ); - } + } else if ( key.equals( m_hideTitle ) ) { + if ( sp.getBoolean( key, false ) && ABUtils.haveActionBar() ) { + CheckBoxPreference pref + = (CheckBoxPreference)findPreference(key); + pref.setChecked( false ); + pref.setEnabled( false ); + showDialog( EXPLAIN_TITLE ); + } + } } private void relaunch()