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

Commit 9d472a50 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

Merge "settings: FC on quick settings editor on tablets without a vibrator" into cm-11.0

parents c12b9bf4 a39d4513

src/com/android/settings/quicksettings/QuickSettings.java

+15 −13
Original line number Diff line number Diff line
@@ -93,9 +93,10 @@ public class QuickSettings extends SettingsPreferenceFragment implements 
            updatePulldownSummary(quickPulldownValue);

        }



        // Add the sound mode

        // Add the sound mode (on dual panels preference the preference could be

        // removed previously so we need to do a null check status)

        mRingMode = (MultiSelectListPreference) prefSet.findPreference(EXP_RING_MODE);



        if (mRingMode != null) {

            Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);

            if (vibrator.hasVibrator()) {

                String storedRingMode = Settings.System.getString(resolver,
@@ -109,6 +110,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements 
            } else {

                mStaticTiles.removePreference(mRingMode);

            }

        }



        // Add the network mode preference

        mNetworkMode = (ListPreference) prefSet.findPreference(EXP_NETWORK_MODE);