Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a11y volume not always being shown" into oc-dr1-dev

Browse Source 
am: e060044217

Change-Id: Icee419c23ead54f5e0764b9a4cfc3d7f1517ca17
This commit is contained in:
Jason Monk
2017-06-28 13:33:44 +00:00
committed by android-build-merger
parent 84510887b0 e060044217
commit 700dfde82b
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
View File

@@ -43,6 +43,7 @@ import android.provider.Settings;
import android.service.notification.Condition; import android.service.notification.Condition;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.view.accessibility.AccessibilityManager;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.systemui.Dumpable; import com.android.systemui.Dumpable;
@@ -122,6 +123,12 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
mReceiver.init(); mReceiver.init();
mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE); mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
mHasVibrator = mVibrator != null && mVibrator.hasVibrator(); mHasVibrator = mVibrator != null && mVibrator.hasVibrator();
boolean accessibilityVolumeStreamActive = context.getSystemService(
AccessibilityManager.class).isAccessibilityVolumeStreamActive();
mVolumeController.setA11yMode(accessibilityVolumeStreamActive ?
VolumePolicy.A11Y_MODE_INDEPENDENT_A11Y_VOLUME :
VolumePolicy.A11Y_MODE_MEDIA_A11Y_VOLUME);
} }
public AudioManager getAudioManager() { public AudioManager getAudioManager() {
@@ -210,6 +217,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
public void addCallback(Callbacks callback, Handler handler) { public void addCallback(Callbacks callback, Handler handler) {
mCallbacks.add(callback, handler); mCallbacks.add(callback, handler);
callback.onAccessibilityModeChanged(mShowA11yStream);
} }
public void setUserActivityListener(UserActivityListener listener) { public void setUserActivityListener(UserActivityListener listener) {