Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9efe81a9 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Cleanup: remove useless checks. 

Change-Id: I73c5c432cb384cbc28d584d751d6e9955a3eda05
parent 09ae55b5

src/com/android/settings/cyanogenmod/MemoryManagement.java

+21 −24
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ public class MemoryManagement extends SettingsPreferenceFragment implements 
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (getPreferenceManager() != null) {



        addPreferencesFromResource(R.xml.memory_management);



        PreferenceScreen prefSet = getPreferenceScreen();
@@ -76,8 +74,9 @@ public class MemoryManagement extends SettingsPreferenceFragment implements 
        mKSMPref = (CheckBoxPreference) prefSet.findPreference(KSM_PREF);



        if (isSwapAvailable()) {

                if (SystemProperties.get(ZRAM_PERSIST_PROP) == "1")

            if (SystemProperties.get(ZRAM_PERSIST_PROP) == "1") {

                SystemProperties.set(ZRAM_PERSIST_PROP, ZRAM_DEFAULT);

            }

            mzRAM.setValue(SystemProperties.get(ZRAM_PERSIST_PROP, ZRAM_DEFAULT));

            mzRAM.setOnPreferenceChangeListener(this);

        } else {
@@ -93,8 +92,6 @@ public class MemoryManagement extends SettingsPreferenceFragment implements 
        String purgeableAssets = SystemProperties.get(PURGEABLE_ASSETS_PERSIST_PROP,

                PURGEABLE_ASSETS_DEFAULT);

        mPurgeableAssetsPref.setChecked("1".equals(purgeableAssets));



        }

    }



    @Override

src/com/android/settings/cyanogenmod/NotificationDrawer.java

+18 −20
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (getPreferenceManager() != null) {

        addPreferencesFromResource(R.xml.notification_drawer);



        ContentResolver resolver = getActivity().getContentResolver();
@@ -84,14 +83,13 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
        mCollapseOnDismiss.setOnPreferenceChangeListener(this);

        updateCollapseBehaviourSummary(collapseBehaviour);



            mPowerWidgetHapticFeedback = (ListPreference) prefSet

                    .findPreference(UI_EXP_WIDGET_HAPTIC_FEEDBACK);

        mPowerWidgetHapticFeedback = (ListPreference)

                prefSet.findPreference(UI_EXP_WIDGET_HAPTIC_FEEDBACK);

        mPowerWidgetHapticFeedback.setOnPreferenceChangeListener(this);

        mPowerWidgetHapticFeedback.setSummary(mPowerWidgetHapticFeedback.getEntry());

        mPowerWidgetHapticFeedback.setValue(Integer.toString(Settings.System.getInt(

                resolver, Settings.System.EXPANDED_HAPTIC_FEEDBACK, 2)));

    }

    }



    private void updateCollapseBehaviourSummary(int setting) {

        String[] summaries = getResources().getStringArray(

src/com/android/settings/cyanogenmod/PerformanceSettings.java

+31 −34
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ public class PerformanceSettings extends SettingsPreferenceFragment 
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (getPreferenceManager() != null) {



        addPreferencesFromResource(R.xml.performance_settings);



        PreferenceScreen prefSet = getPreferenceScreen();
@@ -89,7 +87,6 @@ public class PerformanceSettings extends SettingsPreferenceFragment 
        });

        alertDialog.show();

    }

    }



    @Override

    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {

src/com/android/settings/cyanogenmod/QuietHours.java

+20 −22
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ public class QuietHours extends SettingsPreferenceFragment implements 
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (getPreferenceManager() != null) {

        addPreferencesFromResource(R.xml.quiet_hours_settings);



        ContentResolver resolver = getContentResolver();
@@ -68,7 +67,6 @@ public class QuietHours extends SettingsPreferenceFragment implements 
            prefSet.removePreference(findPreference(Settings.System.QUIET_HOURS_DIM));

        }

    }

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

src/com/android/settings/profiles/AppGroupList.java

+2 −4
Original line number Diff line number Diff line
@@ -44,11 +44,9 @@ public class AppGroupList extends SettingsPreferenceFragment { 
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (getPreferenceManager() != null) {

        addPreferencesFromResource(R.xml.appgroup_list);

        mProfileManager = (ProfileManager) getActivity().getSystemService(PROFILE_SERVICE);

    }

    }



    @Override

    public void onResume() {