修正 ListPreference 不显示显示 summary

res/xml/about_settings.xml

@@ -64,7 +64,6 @@
             android:entryValues="@array/update_server_entry_values"
             android:key="update_server"
             android:title="@string/update_server_title"
-            android:summary="%s"
             android:defaultValue="1" />
 
         <Preference

res/xml/display_settings.xml

@@ -41,8 +41,7 @@
             android:title="@string/screen_orientation_title"
             android:entries="@array/screen_orientation_entries"
             android:entryValues="@array/screen_orientation_entry_values"
-            android:defaultValue="0"
-            android:summary="%s" />
+            android:defaultValue="0" />
 
     </PreferenceCategory>
 
@@ -54,8 +53,7 @@
             android:title="@string/list_mode_title"
             android:entries="@array/list_mode_entries"
             android:entryValues="@array/list_mode_entry_values"
-            android:defaultValue="0"
-            android:summary="%s" />
+            android:defaultValue="0" />
 
         <com.hippo.ehviewer.preference.NumberOfColumnsPreference
             xmlns:auto="http://schemas.android.com/apk/res-auto"

res/xml/eh_settings.xml

@@ -50,7 +50,6 @@
             android:entries="@array/preview_mode_entries"
             android:entryValues="@array/preview_mode_entry_values"
             android:key="preview_mode"
-            android:summary="%s"
             android:title="@string/preview_mode_title" />
 
     </PreferenceCategory>
@@ -61,8 +60,7 @@
             android:key="default_favorite"
             android:title="@string/default_favorite"
             android:entryValues="@array/default_favorite_entry_values"
-            android:defaultValue="-2"
-            android:summary="%s" />
+            android:defaultValue="-2" />
 
     </PreferenceCategory>
 

src/com/hippo/ehviewer/preference/ListPreference.java

@@ -102,8 +102,10 @@ public class ListPreference extends DialogPreference {
     @Override
     public CharSequence getSummary() {
         final CharSequence entry = getEntry();
-        if (mSummary == null || entry == null) {
+        if (entry == null) {
             return super.getSummary();
+        } else if (mSummary == null) {
+            return entry;
         } else {
             return String.format(mSummary, entry);
         }