diff options
author | Tony Mantler <nicoya@google.com> | 2014-06-19 11:15:51 -0700 |
---|---|---|
committer | Tony Mantler <nicoya@google.com> | 2014-06-19 14:40:21 -0700 |
commit | 7da3422697f511ed4aa8aa73462917fbd0cffabf (patch) | |
tree | e0afd2310fba192f9e67fa971bd143b02c3d18d9 /src/com/android/mail/ui/settings/GeneralPrefsFragment.java | |
parent | 2ee62c0050ff141cc58f4a6801d295915e0b9b6c (diff) | |
download | android_packages_apps_UnifiedEmail-7da3422697f511ed4aa8aa73462917fbd0cffabf.tar.gz android_packages_apps_UnifiedEmail-7da3422697f511ed4aa8aa73462917fbd0cffabf.tar.bz2 android_packages_apps_UnifiedEmail-7da3422697f511ed4aa8aa73462917fbd0cffabf.zip |
Create MailPreferenceActivity
Enable test for GeneralPrefsFragment
Add test instance support to MailPrefs
Fix some values that weren't getting .apply()'d
b/9566150
Change-Id: Ia636c748c67518b0a6e3d436c8bfd09620fda6fc
Diffstat (limited to 'src/com/android/mail/ui/settings/GeneralPrefsFragment.java')
-rw-r--r-- | src/com/android/mail/ui/settings/GeneralPrefsFragment.java | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/com/android/mail/ui/settings/GeneralPrefsFragment.java b/src/com/android/mail/ui/settings/GeneralPrefsFragment.java index e4b176bad..b3ed97373 100644 --- a/src/com/android/mail/ui/settings/GeneralPrefsFragment.java +++ b/src/com/android/mail/ui/settings/GeneralPrefsFragment.java @@ -41,6 +41,7 @@ import com.android.mail.providers.UIProvider.AutoAdvance; import com.android.mail.providers.UIProvider.SnapHeaderValue; import com.android.mail.utils.LogUtils; import com.android.mail.R; +import com.android.mail.utils.Utils; import com.google.common.annotations.VisibleForTesting; /** @@ -53,6 +54,8 @@ public class GeneralPrefsFragment extends MailPreferenceFragment static final String AUTO_ADVANCE_WIDGET = "auto-advance-widget"; static final String SNAP_HEADER_MODE_WIDGET = "snap-header-mode-widget"; + static final String CALLED_FROM_TEST = "called-from-test"; + // Category for removal actions protected static final String REMOVAL_ACTIONS_GROUP = "removal-actions-group"; @@ -61,32 +64,18 @@ public class GeneralPrefsFragment extends MailPreferenceFragment private AlertDialog mClearSearchHistoryDialog; private ListPreference mAutoAdvance; - @VisibleForTesting - static final int[] AUTO_ADVANCE_VALUES = { + private static final int[] AUTO_ADVANCE_VALUES = { AutoAdvance.NEWER, AutoAdvance.OLDER, AutoAdvance.LIST }; private ListPreference mSnapHeader; - @VisibleForTesting - static final int[] SNAP_HEADER_VALUES = { + private static final int[] SNAP_HEADER_VALUES = { SnapHeaderValue.ALWAYS, SnapHeaderValue.PORTRAIT_ONLY, SnapHeaderValue.NEVER }; - private final boolean mCalledFromTest; - - public GeneralPrefsFragment() { - super(); - mCalledFromTest = false; - } - - @VisibleForTesting - GeneralPrefsFragment(boolean fromTest) { - mCalledFromTest = fromTest; - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -103,9 +92,10 @@ public class GeneralPrefsFragment extends MailPreferenceFragment addPreferencesFromResource(R.xml.general_preferences); - // Disabling snap headers is just for phones - if (!mCalledFromTest - && com.android.mail.utils.Utils.useTabletUI(getActivity().getResources())) { + // Disabling snap headers is just for phones and unit tests + final Bundle args = getArguments(); + final boolean calledFromTest = args != null && args.getBoolean(CALLED_FROM_TEST, false); + if (!calledFromTest && Utils.useTabletUI(getActivity().getResources())) { final PreferenceScreen ps = getPreferenceScreen(); ps.removePreference(findPreference(SNAP_HEADER_MODE_WIDGET)); } |