Revert "Add primary switch for vibration settings screen"

This reverts commit fd54fc34c6.

Reason for revert: b/215275738

Change-Id: I93612df6493a2a4184a98b3f049e23aa888095f2

src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceController.java

@@ -21,6 +21,7 @@ import android.database.ContentObserver;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Handler;
+import android.os.VibrationAttributes;
 import android.os.Vibrator;
 import android.provider.DeviceConfig;
 import android.provider.Settings;
@@ -56,9 +57,8 @@ public class VibrationRampingRingerTogglePreferenceController
 
     private final DeviceConfigProvider mDeviceConfigProvider;
     private final ContentObserver mSettingObserver;
+    private final Vibrator mVibrator;
     private final AudioManager mAudioManager;
-    private final VibrationPreferenceConfig mRingVibrationPreferenceConfig;
-    private final VibrationPreferenceConfig.SettingObserver mRingSettingObserver;
 
     private Preference mPreference;
 
@@ -70,10 +70,8 @@ public class VibrationRampingRingerTogglePreferenceController
             String preferenceKey, DeviceConfigProvider deviceConfigProvider) {
         super(context, preferenceKey);
         mDeviceConfigProvider = deviceConfigProvider;
+        mVibrator = context.getSystemService(Vibrator.class);
         mAudioManager = context.getSystemService(AudioManager.class);
-        mRingVibrationPreferenceConfig = new RingVibrationPreferenceConfig(context);
-        mRingSettingObserver = new VibrationPreferenceConfig.SettingObserver(
-                mRingVibrationPreferenceConfig);
         mSettingObserver = new ContentObserver(new Handler(/* async= */ true)) {
             @Override
             public void onChange(boolean selfChange, Uri uri) {
@@ -93,16 +91,18 @@ public class VibrationRampingRingerTogglePreferenceController
 
     @Override
     public void onStart() {
-        mRingSettingObserver.register(mContext.getContentResolver());
         mContext.getContentResolver().registerContentObserver(
                 Settings.System.getUriFor(Settings.System.APPLY_RAMPING_RINGER),
                 /* notifyForDescendants= */ false,
                 mSettingObserver);
+        mContext.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.RING_VIBRATION_INTENSITY),
+                /* notifyForDescendants= */ false,
+                mSettingObserver);
     }
 
     @Override
     public void onStop() {
-        mRingSettingObserver.unregister(mContext.getContentResolver());
         mContext.getContentResolver().unregisterContentObserver(mSettingObserver);
     }
 
@@ -110,7 +110,6 @@ public class VibrationRampingRingerTogglePreferenceController
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
-        mRingSettingObserver.onDisplayPreference(this, mPreference);
         mPreference.setEnabled(isRingVibrationEnabled());
     }
 
@@ -142,8 +141,9 @@ public class VibrationRampingRingerTogglePreferenceController
     }
 
     private boolean isRingVibrationEnabled() {
-        return mRingVibrationPreferenceConfig.isPreferenceEnabled()
-                && (mRingVibrationPreferenceConfig.readIntensity()
-                != Vibrator.VIBRATION_INTENSITY_OFF);
+        final int ringIntensity = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.RING_VIBRATION_INTENSITY,
+                mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_RINGTONE));
+        return ringIntensity != Vibrator.VIBRATION_INTENSITY_OFF;
     }
 }