diff options
| author | Chen Xu <fionaxu@google.com> | 2021-05-05 20:05:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-05 20:05:34 +0000 |
| commit | a50305fc257bfa1338e8efb7ae2bed9a01d0bd95 (patch) | |
| tree | 69a0fe66bdd9016dcce472a895e05a8fe4bc02e4 /src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java | |
| parent | 4ef024625c3d214d2de57f2d656cbaf6690936a2 (diff) | |
| parent | af7ce2a9f18afa0b7ee8870a24722cd9183656e8 (diff) | |
| download | CellBroadcastReceiver-a50305fc257bfa1338e8efb7ae2bed9a01d0bd95.tar.gz | |
Merge "improve vibration toggle visibility" into mainline-prod am: af7ce2a9f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/14391245
Change-Id: I31567aa2909c6695d605c2328f8abc02ada348f4
Diffstat (limited to 'src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java')
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java index 63173bbea..97822cfe1 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java @@ -30,6 +30,7 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.PersistableBundle; import android.os.UserManager; +import android.os.Vibrator; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.util.Log; @@ -644,7 +645,9 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity { // override DND default is turned off. // In some countries, override DND is always on, which means vibration is always on. // In that case, no need to show vibration toggle for users. - mEnableVibrateCheckBox.setVisible(res.getBoolean(R.bool.show_vibration_settings) + Vibrator vibrator = getContext().getSystemService(Vibrator.class); + boolean supportVibration = (vibrator != null) && vibrator.hasVibrator(); + mEnableVibrateCheckBox.setVisible(supportVibration && (res.getBoolean(R.bool.show_override_dnd_settings) || !res.getBoolean(R.bool.override_dnd))); } |