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

Commit 35bab571 authored by Shawn Alty's avatar Shawn Alty
Browse files

Calendar widget selection logic fix 

Fixes the calendar widget checkbox logic to be hidden when lockscreen widgets are hidden.
parent 4a26d7f6

src/com/cyanogenmod/cmparts/activities/LockscreenWidgetsActivity.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -159,9 +159,10 @@ public class LockscreenWidgetsActivity extends PreferenceActivity implements 
        mCalendarAlarmPref.setChecked(Settings.System.getInt(getContentResolver(),

        mCalendarAlarmPref.setChecked(Settings.System.getInt(getContentResolver(),

                Settings.System.LOCKSCREEN_CALENDAR_ALARM, 0) == 1);

                Settings.System.LOCKSCREEN_CALENDAR_ALARM, 0) == 1);





        boolean enableAlwaysBatteryPref = !mLockscreenWidgetLayout.getEntry().equals(getResources()

        boolean enableShowWidgetsPref = !mLockscreenWidgetLayout.getEntry().equals(getResources()

                .getStringArray(R.array.pref_lockscreen_widget_layout_entries)[1]);

                .getStringArray(R.array.pref_lockscreen_widget_layout_entries)[1]);

        mAlwaysBatteryPref.setEnabled(enableAlwaysBatteryPref);

        mAlwaysBatteryPref.setEnabled(enableShowWidgetsPref);

        mCalendarAlarmPref.setEnabled(enableShowWidgetsPref);

    }

    }





    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {

    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
@@ -226,6 +227,7 @@ public class LockscreenWidgetsActivity extends PreferenceActivity implements 
            Integer val = Integer.valueOf(newValue.toString());

            Integer val = Integer.valueOf(newValue.toString());

            Settings.System.putInt(getContentResolver(), Settings.System.LOCKSCREEN_WIDGETS_LAYOUT,val);

            Settings.System.putInt(getContentResolver(), Settings.System.LOCKSCREEN_WIDGETS_LAYOUT,val);

            mAlwaysBatteryPref.setEnabled(val != 1);

            mAlwaysBatteryPref.setEnabled(val != 1);

            mCalendarAlarmPref.setEnabled(val != 1);

            return true;

            return true;

        }

        }

        return false;

        return false;