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

Commit 5ca95186 authored by fuzz's avatar fuzz Committed by Danny Baumann
Browse files

Settings: Fix up Sound tile if device doesn't have vibrator 

The sound tile doesn't work properly on non-vibrator device until user check corresponding mode.

This patch will fix that issue, force Silent and Sound mode enabled by default and remove sound
mode preference so that user can't edit it.

PS8 : Remove Sound modes preference on non-vibrator device
PS9 : Remove unneeded updateSummary()
PS10: Remove unneeded block
PS11: Cleanup
PS12: Update commit message

Change-Id: I6f29a5b4590f9ab959e2164920afa0f8fe621656
parent 561d03e5

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);