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

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

Merge "Settings: Fix up Sound tile if device doesn't have vibrator" into cm-10.2

parents 35c3778e 5ca95186

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

+15 −7
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ import java.util.HashSet; 
import java.util.Set;



import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.Vibrator;

import android.preference.ListPreference;

import android.preference.MultiSelectListPreference;

import android.preference.Preference;
@@ -92,6 +94,9 @@ public class QuickSettings extends SettingsPreferenceFragment implements 


        // Add the sound mode

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



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

        if (vibrator.hasVibrator()) {

            String storedRingMode = Settings.System.getString(resolver,

                    Settings.System.EXPANDED_RING_MODE);

            if (storedRingMode != null) {
@@ -100,6 +105,9 @@ public class QuickSettings extends SettingsPreferenceFragment implements 
                updateSummary(storedRingMode, mRingMode, R.string.pref_ring_mode_summary);

            }

            mRingMode.setOnPreferenceChangeListener(this);

        } else {

            mStaticTiles.removePreference(mRingMode);

        }



        // Add the network mode preference

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