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

Commit 09c00e39 authored by Michael W's avatar Michael W
Browse files

DeskClock: Don't duplicate code 

* Instead of duplication, move common code to a method and call that

Change-Id: If7641d0731264aaa52084fc093b11bd2fafffb64
parent 0137eb8c

src/com/android/deskclock/settings/SettingsActivity.java

+11 −16
Original line number Diff line number Diff line
@@ -275,28 +275,23 @@ public final class SettingsActivity extends CollapsingToolbarBaseActivity { 
            timerRingtonePref.setOnPreferenceClickListener(this);

            timerRingtonePref.setSummary(DataModel.getDataModel().getTimerRingtoneTitle());



            SensorManager sensorManager = (SensorManager)

                    getActivity().getSystemService(Context.SENSOR_SERVICE);



            final SimpleMenuPreference flipActionPref = findPreference(KEY_FLIP_ACTION);

            if (flipActionPref != null) {

                List<Sensor> sensorList = sensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER);

                if (sensorList.size() < 1) { // This will be true if no accelerometer sensor

                    flipActionPref.setValue("0"); // Turn it off

                } else {

                    flipActionPref.setSummary(flipActionPref.getEntry());

                    flipActionPref.setOnPreferenceChangeListener(this);

                }

            }

            setupFlipOrShakeAction(flipActionPref);



            final SimpleMenuPreference shakeActionPref = findPreference(KEY_SHAKE_ACTION);

            if (shakeActionPref != null) {

            setupFlipOrShakeAction(shakeActionPref);

        }



        private void setupFlipOrShakeAction(SimpleMenuPreference preference) {

            if (preference != null) {

                SensorManager sensorManager = (SensorManager)

                        getActivity().getSystemService(Context.SENSOR_SERVICE);

                List<Sensor> sensorList = sensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER);

                if (sensorList.size() < 1) { // This will be true if no accelerometer sensor

                    shakeActionPref.setValue("0"); // Turn it off

                    preference.setValue("0"); // Turn it off

                } else {

                    shakeActionPref.setSummary(shakeActionPref.getEntry());

                    shakeActionPref.setOnPreferenceChangeListener(this);

                    preference.setSummary(preference.getEntry());

                    preference.setOnPreferenceChangeListener(this);

                }

            }

        }