PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix phone muted conditional card not show up

Browse Source 
When DND mode is on, the phone muted conditional card will not appear.
The phone muted event is independent of DND mode, so the condition of
DND mode is taken out.

Bug: 119312937
Test: visual
Change-Id: Ie79dca1e4f607e666014512855922db10aa5a3d7
This commit is contained in:
Mill Chen
2018-11-12 13:35:59 +08:00
parent 963d578146
commit b122b17b08
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java
View File

@@ -16,12 +16,8 @@
package com.android.settings.homepage.contextualcards.conditional; package com.android.settings.homepage.contextualcards.conditional;
import static android.content.Context.NOTIFICATION_SERVICE;
import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.media.AudioManager; import android.media.AudioManager;
import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R; import com.android.settings.R;
@@ -32,14 +28,11 @@ import java.util.Objects;
public class RingerMutedConditionController extends AbnormalRingerConditionController { public class RingerMutedConditionController extends AbnormalRingerConditionController {
static final int ID = Objects.hash("RingerMutedConditionController"); static final int ID = Objects.hash("RingerMutedConditionController");
private final NotificationManager mNotificationManager;
private final Context mAppContext; private final Context mAppContext;
public RingerMutedConditionController(Context appContext, ConditionManager conditionManager) { public RingerMutedConditionController(Context appContext, ConditionManager conditionManager) {
super(appContext, conditionManager); super(appContext, conditionManager);
mAppContext = appContext; mAppContext = appContext;
mNotificationManager =
(NotificationManager) appContext.getSystemService(NOTIFICATION_SERVICE);
} }
@Override @Override
@@ -49,14 +42,7 @@ public class RingerMutedConditionController extends AbnormalRingerConditionContr
@Override @Override
public boolean isDisplayable() { public boolean isDisplayable() {
int zen = Settings.Global.ZEN_MODE_OFF; return mAudioManager.getRingerModeInternal() == AudioManager.RINGER_MODE_SILENT;
if (mNotificationManager != null) {
zen = mNotificationManager.getZenMode();
}
final boolean zenModeEnabled = zen != Settings.Global.ZEN_MODE_OFF;
final boolean isSilent =
mAudioManager.getRingerModeInternal() == AudioManager.RINGER_MODE_SILENT;
return isSilent && !zenModeEnabled;
} }
@Override @Override