tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(app): orientation changing causes floating window keep to side

Browse Source
This commit is contained in:
hyb1996
2018-06-03 09:54:14 +08:00
parent 9c612ea8bd
commit 28a551324a
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/org/autojs/autojs/ui/floating/CircularMenuWindow.java
View File

@@ -1,9 +1,11 @@
package org.autojs.autojs.ui.floating; package org.autojs.autojs.ui.floating;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.hardware.Sensor; import android.hardware.Sensor;
import android.hardware.SensorEvent; import android.hardware.SensorEvent;
import android.hardware.SensorEventListener; import android.hardware.SensorEventListener;
import android.util.Log;
import android.view.OrientationEventListener; import android.view.OrientationEventListener;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
@@ -14,7 +16,7 @@ import com.stardust.enhancedfloaty.WindowBridge;
import com.stardust.floatingcircularactionmenu.CircularActionMenu; import com.stardust.floatingcircularactionmenu.CircularActionMenu;
import com.stardust.floatingcircularactionmenu.gesture.BounceDragGesture; import com.stardust.floatingcircularactionmenu.gesture.BounceDragGesture;
public class CircularMenuWindow implements FloatyWindow, SensorEventListener { public class CircularMenuWindow implements FloatyWindow {
protected CircularMenuFloaty mFloaty; protected CircularMenuFloaty mFloaty;
protected WindowManager mWindowManager; protected WindowManager mWindowManager;
@@ -49,8 +51,8 @@ public class CircularMenuWindow implements FloatyWindow, SensorEventListener {
mOrientationEventListener = new OrientationEventListener(mContext) { mOrientationEventListener = new OrientationEventListener(mContext) {
@Override @Override
public void onOrientationChanged(int orientation) { public void onOrientationChanged(int orientation) {
if (mActionViewWindowBridge.isOrientationChanged(orientation)) { if (mActionViewWindowBridge.isOrientationChanged(mContext.getResources().getConfiguration().orientation)) {
mDragGesture.keepToEdge(); keepToSide();
} }
} }
}; };
@@ -59,8 +61,12 @@ public class CircularMenuWindow implements FloatyWindow, SensorEventListener {
} }
} }
private void keepToSide() {
mDragGesture.keepToEdge();
}
private void setInitialState() { private void setInitialState() {
this.mDragGesture.keepToEdge(); keepToSide();
} }
private void initGestures() { private void initGestures() {
@@ -190,13 +196,4 @@ public class CircularMenuWindow implements FloatyWindow, SensorEventListener {
FloatyService.removeWindow(this); FloatyService.removeWindow(this);
} }
@Override
public void onSensorChanged(SensorEvent event) {
mDragGesture.keepToEdge();
}
@Override
public void onAccuracyChanged(Sensor sensor, int accuracy) {
}
} }

1
app/src/main/java/org/autojs/autojs/ui/floating/OrientationAwareWindowBridge.java
View File

@@ -2,6 +2,7 @@ package org.autojs.autojs.ui.floating;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;