From e31d218dc5f1fdb8aa12e0767bbf219ec8d58d5d Mon Sep 17 00:00:00 2001 From: Dan Applebaum Date: Fri, 4 Feb 2011 17:01:22 +0000 Subject: [PATCH] At Jesse's suggestion, avoid the use of the Android term-of-art "density". Instead use "Compact layouts" to refer, both internally and externally, to the feature of elminating minimum sizes on UI elements and other minor layout changes for maximizing information quantity to be displayed on a page. Others are free to adjust the user-facing text further. --- res/values/strings.xml | 4 ++-- res/xml/global_preferences.xml | 6 +++--- src/com/fsck/k9/K9.java | 14 +++++++------- src/com/fsck/k9/activity/Accounts.java | 4 ++-- src/com/fsck/k9/activity/FolderList.java | 2 +- src/com/fsck/k9/activity/setup/Prefs.java | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 25011fd40..a161796d4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -903,8 +903,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin Gestures Accept gesture control - High density - Adjust layouts to display more on each page + Compact layouts + Adjust layouts to display more on each page Volume key navigation Flip through items using the volume controls diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml index 0c138e3f7..b58487e67 100644 --- a/res/xml/global_preferences.xml +++ b/res/xml/global_preferences.xml @@ -69,9 +69,9 @@ + android:key="compact_layouts" + android:title="@string/compact_layouts_title" + android:summary="@string/compact_layouts_summary" /> diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java index 7eed5f155..a925a028e 100644 --- a/src/com/fsck/k9/K9.java +++ b/src/com/fsck/k9/K9.java @@ -176,7 +176,7 @@ public class K9 extends Application private static boolean mQuietTimeEnabled = false; private static String mQuietTimeStarts = null; private static String mQuietTimeEnds = null; - private static boolean highDensity = false; + private static boolean compactLayouts = false; @@ -455,7 +455,7 @@ public class K9 extends Application editor.putBoolean("keyguardPrivacy", mKeyguardPrivacy); - editor.putBoolean("highDensity", highDensity); + editor.putBoolean("compactLayouts", compactLayouts); fontSizes.save(editor); } @@ -507,7 +507,7 @@ public class K9 extends Application mKeyguardPrivacy = sprefs.getBoolean("keyguardPrivacy", false); - highDensity = sprefs.getBoolean("highDensity", false); + compactLayouts = sprefs.getBoolean("compactLayouts", false); fontSizes.load(sprefs); @@ -1042,14 +1042,14 @@ public class K9 extends Application mKeyguardPrivacy = state; } - public static boolean isHighDensity() + public static boolean useCompactLayouts() { - return highDensity; + return compactLayouts; } - public static void setHighDensity(boolean highDensity) + public static void setCompactLayouts(boolean compactLayouts) { - K9.highDensity = highDensity; + K9.compactLayouts = compactLayouts; } /** diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java index 9f5a895bd..7efd1ab54 100644 --- a/src/com/fsck/k9/activity/Accounts.java +++ b/src/com/fsck/k9/activity/Accounts.java @@ -1081,11 +1081,11 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC holder.description.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getAccountName()); holder.email.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getAccountDescription()); - if (K9.isHighDensity()) + if (K9.useCompactLayouts()) { holder.accountsItemLayout.setMinimumHeight(0); } - if (account instanceof SearchAccount || K9.isHighDensity()) + if (account instanceof SearchAccount || K9.useCompactLayouts()) { holder.folders.setVisibility(View.GONE); diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java index 07e43100b..2b343861e 100644 --- a/src/com/fsck/k9/activity/FolderList.java +++ b/src/com/fsck/k9/activity/FolderList.java @@ -1404,7 +1404,7 @@ public class FolderList extends K9ListActivity { holder.flaggedMessageCount.setVisibility(View.GONE); } - if (K9.isHighDensity() && holder.folderListItemLayout != null) + if (K9.useCompactLayouts() && holder.folderListItemLayout != null) { holder.folderListItemLayout.setMinimumHeight(0); } diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java index f269290c4..334084572 100644 --- a/src/com/fsck/k9/activity/setup/Prefs.java +++ b/src/com/fsck/k9/activity/setup/Prefs.java @@ -61,7 +61,7 @@ public class Prefs extends K9PreferenceActivity private static final String PREFERENCE_MESSAGELIST_SHOW_CONTACT_NAME = "messagelist_show_contact_name"; private static final String PREFERENCE_MESSAGELIST_CONTACT_NAME_COLOR = "messagelist_contact_name_color"; private static final String PREFERENCE_MESSAGEVIEW_FIXEDWIDTH = "messageview_fixedwidth_font"; - private static final String PREFERENCE_HIGH_DENSITY = "high_density"; + private static final String PREFERENCE_COMPACT_LAYOUTS = "compact_layouts"; private static final String PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST = "messageview_return_to_list"; private static final String PREFERENCE_MESSAGEVIEW_ZOOM_CONTROLS_ENABLED = "messageview_zoom_controls"; @@ -104,7 +104,7 @@ public class Prefs extends K9PreferenceActivity private CheckBoxPreference mUseGalleryBugWorkaround; private CheckBoxPreference mDebugLogging; private CheckBoxPreference mSensitiveLogging; - private CheckBoxPreference highDensity; + private CheckBoxPreference compactLayouts; private CheckBoxPreference mQuietTimeEnabled; private com.fsck.k9.preferences.TimePickerPreference mQuietTimeStarts; @@ -173,8 +173,8 @@ public class Prefs extends K9PreferenceActivity mGestures = (CheckBoxPreference)findPreference(PREFERENCE_GESTURES); mGestures.setChecked(K9.gesturesEnabled()); - highDensity = (CheckBoxPreference)findPreference(PREFERENCE_HIGH_DENSITY); - highDensity.setChecked(K9.isHighDensity()); + compactLayouts = (CheckBoxPreference)findPreference(PREFERENCE_COMPACT_LAYOUTS); + compactLayouts.setChecked(K9.useCompactLayouts()); mVolumeNavigation = (CheckBoxListPreference)findPreference(PREFERENCE_VOLUME_NAVIGATION); mVolumeNavigation.setItems(new CharSequence[] {getString(R.string.volume_navigation_message), getString(R.string.volume_navigation_list)}); @@ -316,7 +316,7 @@ public class Prefs extends K9PreferenceActivity K9.setK9Theme(mTheme.getValue().equals("dark") ? android.R.style.Theme : android.R.style.Theme_Light); K9.setAnimations(mAnimations.isChecked()); K9.setGesturesEnabled(mGestures.isChecked()); - K9.setHighDensity(highDensity.isChecked()); + K9.setCompactLayouts(compactLayouts.isChecked()); K9.setUseVolumeKeysForNavigation(mVolumeNavigation.getCheckedItems()[0]); K9.setUseVolumeKeysForListNavigation(mVolumeNavigation.getCheckedItems()[1]); K9.setManageBack(mManageBack.isChecked());