Merge "Make Media Vibration setting configurable" am: dcb1dbc7f5
am: 8f77a3bfb4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2432412 Change-Id: I37d172d2e6aa6f988a891fa2e26112baa332e033 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -20,6 +20,8 @@ import android.content.Context;
|
||||
import android.os.VibrationAttributes;
|
||||
import android.provider.Settings;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
/** Preference controller for am vibration intensity */
|
||||
public class MediaVibrationIntensityPreferenceController
|
||||
extends VibrationIntensityPreferenceController {
|
||||
@@ -46,6 +48,7 @@ public class MediaVibrationIntensityPreferenceController
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return AVAILABLE;
|
||||
return mContext.getResources().getBoolean(R.bool.config_media_vibration_supported) ?
|
||||
AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
}
|
||||
|
@@ -19,6 +19,7 @@ package com.android.settings.accessibility;
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.accessibility.MediaVibrationIntensityPreferenceController.MediaVibrationPreferenceConfig;
|
||||
import com.android.settings.R;
|
||||
|
||||
/** Preference controller for alarm vibration with only a toggle for on/off states. */
|
||||
public class MediaVibrationTogglePreferenceController extends VibrationTogglePreferenceController {
|
||||
@@ -29,6 +30,7 @@ public class MediaVibrationTogglePreferenceController extends VibrationTogglePre
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return AVAILABLE;
|
||||
return mContext.getResources().getBoolean(R.bool.config_media_vibration_supported) ?
|
||||
AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user