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

DO NOT MERGE Have volume UI dismiss on home button press. am: 25400fdcb9

Browse Source 
Change-Id: I41f3e4167c097ee1df5ef5fd4d07932967995b33
This commit is contained in:
Automerger Merge Worker
2020-02-19 22:43:28 +00:00
parent 83d8de2f15 25400fdcb9
commit e5eca9739d
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
View File

@@ -26,8 +26,11 @@ import android.app.KeyguardManager;
import android.car.Car; import android.car.Car;
import android.car.Car.CarServiceLifecycleListener; import android.car.Car.CarServiceLifecycleListener;
import android.car.media.CarAudioManager; import android.car.media.CarAudioManager;
import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.content.res.XmlResourceParser; import android.content.res.XmlResourceParser;
import android.graphics.Color; import android.graphics.Color;
@@ -39,6 +42,7 @@ import android.os.Debug;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.UserHandle;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
@@ -175,6 +179,17 @@ public class CarVolumeDialogImpl implements VolumeDialog {
mCarAudioManager.registerCarVolumeCallback(mVolumeChangeCallback); mCarAudioManager.registerCarVolumeCallback(mVolumeChangeCallback);
}; };
private final BroadcastReceiver mHomeButtonPressedBroadcastReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (!intent.getAction().equals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)) {
return;
}
dismiss(Events.DISMISS_REASON_VOLUME_CONTROLLER);
}
};
public CarVolumeDialogImpl(Context context) { public CarVolumeDialogImpl(Context context) {
mContext = context; mContext = context;
mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE); mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
@@ -204,6 +219,10 @@ public class CarVolumeDialogImpl implements VolumeDialog {
public void init(int windowType, Callback callback) { public void init(int windowType, Callback callback) {
initDialog(); initDialog();
mContext.registerReceiverAsUser(mHomeButtonPressedBroadcastReceiver, UserHandle.CURRENT,
new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), /* broadcastPermission= */
null, /* scheduler= */ null);
((CarSystemUIFactory) SystemUIFactory.getInstance()).getCarServiceProvider(mContext) ((CarSystemUIFactory) SystemUIFactory.getInstance()).getCarServiceProvider(mContext)
.addListener(mCarServiceLifecycleListener); .addListener(mCarServiceLifecycleListener);
} }
@@ -212,6 +231,8 @@ public class CarVolumeDialogImpl implements VolumeDialog {
public void destroy() { public void destroy() {
mHandler.removeCallbacksAndMessages(/* token= */ null); mHandler.removeCallbacksAndMessages(/* token= */ null);
mContext.unregisterReceiver(mHomeButtonPressedBroadcastReceiver);
cleanupAudioManager(); cleanupAudioManager();
} }