1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 19:42:17 +02:00

synchronization with beta branch

This commit is contained in:
Nikolay Pultsin 2013-11-09 07:43:35 +00:00
parent 461ee2c6e2
commit cedb1ad9f4

View file

@ -319,7 +319,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
cssScreen.addOption(collection.UseCSSTextAlignmentOption, "textAlignment"); cssScreen.addOption(collection.UseCSSTextAlignmentOption, "textAlignment");
final Screen colorsScreen = createPreferenceScreen("colors"); final Screen colorsScreen = createPreferenceScreen("colors");
colorsScreen.addPreference(new WallpaperPreference( final WallpaperPreference wallpaperPreference = new WallpaperPreference(
this, profile, colorsScreen.Resource, "background" this, profile, colorsScreen.Resource, "background"
) { ) {
@Override @Override
@ -327,7 +327,8 @@ public class PreferenceActivity extends ZLPreferenceActivity {
super.onDialogClosed(result); super.onDialogClosed(result);
bgPreferences.setEnabled("".equals(getValue())); bgPreferences.setEnabled("".equals(getValue()));
} }
}); };
colorsScreen.addPreference(wallpaperPreference);
bgPreferences.add( bgPreferences.add(
colorsScreen.addOption(profile.BackgroundOption, "backgroundColor") colorsScreen.addOption(profile.BackgroundOption, "backgroundColor")
); );