VolumePanel: P404: make it panel side aware

Change-Id: I32b104100d1778b4c587c3def151f70a5d8646b0

1 files changed, 10 insertions, 7 deletions

diff --git a/P404Panel/src/co/potatoproject/plugin/volume/p404/VolumeDialogImpl.java b/P404Panel/src/co/potatoproject/plugin/volume/p404/VolumeDialogImpl.java
index 4490b16..34d353b 100644
--- a/P404Panel/src/co/potatoproject/plugin/volume/p404/VolumeDialogImpl.java
+++ b/P404Panel/src/co/potatoproject/plugin/volume/p404/VolumeDialogImpl.java
@@ -17,9 +17,6 @@
 
 package co.potatoproject.plugin.volume.p404;
 
-import android.media.AppTrackData;
-import android.database.ContentObserver;
-import android.os.UserHandle;
 import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
 import static android.media.AudioManager.RINGER_MODE_NORMAL;
 import static android.media.AudioManager.RINGER_MODE_SILENT;
@@ -53,6 +50,7 @@ import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.database.ContentObserver;
 import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
@@ -67,6 +65,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.os.VibrationEffect;
 import android.provider.Settings;
 import android.provider.Settings.Global;
@@ -127,7 +126,7 @@ import java.util.List;
 @Requires(target = VolumeDialog.Callback.class, version = VolumeDialog.Callback.VERSION)
 @Requires(target = VolumeDialogController.class, version = VolumeDialogController.VERSION)
 @Requires(target = ActivityStarter.class, version = ActivityStarter.VERSION)
-public class VolumeDialogImpl implements VolumeDialog {
+public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
     private static final String TAG = Utils.logTag(VolumeDialogImpl.class);
     public static final String ACTION_MEDIA_OUTPUT =
             "com.android.settings.panel.action.MEDIA_OUTPUT";
@@ -189,7 +188,6 @@ public class VolumeDialogImpl implements VolumeDialog {
 
     private SettingsObserver settingsObserver;
     private boolean mExpanded;
-    private boolean mVolumePanelOnLeft;
     private boolean mAppVolume;
 
     public VolumeDialogImpl() {}
@@ -206,7 +204,7 @@ public class VolumeDialogImpl implements VolumeDialog {
         mAccessibilityMgr = mContext.getSystemService(AccessibilityManager.class);
         mShowActiveStreamOnly = showActiveStreamOnly();
         mHasSeenODICaptionsTooltip = true;
-        mVolumePanelOnLeft = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.VOLUME_PANEL_ON_LEFT, 0) == 1;
+        initObserver(pluginContext, sysuiContext);
         settingsObserver = new SettingsObserver(mHandler);
         settingsObserver.observe();
     }
@@ -227,6 +225,11 @@ public class VolumeDialogImpl implements VolumeDialog {
         settingsObserver.unobserve();
     }
 
+    @Override
+    protected void onSideChange() {
+        initDialog();
+    }
+
     private void initDialog() {
         mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
 
@@ -1698,7 +1701,7 @@ public class VolumeDialogImpl implements VolumeDialog {
     }
 
     private boolean isAudioPanelOnLeftSide() {
-        return mLeftVolumeRocker;
+        return mVolumePanelOnLeft;
     }
 
     private static class VolumeRow {