when user press back key,fist close the menu,then back

Loop-X · Sep 21, 2016 · 7ef3c02 · 7ef3c02
1 parent b0b48f8
commit 7ef3c02
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/app/src/main/java/io/github/loopX/XAlarm/MainActivity.java b/app/src/main/java/io/github/loopX/XAlarm/MainActivity.java
@@ -43,6 +43,8 @@
 import io.github.loopX.XAlarm.view.UnlockTypeMenuLayout;
 import io.github.loopX.XAlarm.view.YummyTextView;
 
+import static android.os.Build.VERSION_CODES.M;
+
 public class MainActivity extends BaseActivity implements View.OnClickListener, DragMenuLayout.DragMenuStateListener {
 
     private static final String TAG = "ywp.MainActivity";
@@ -427,7 +429,7 @@ private void setLeftMenuStatus() {
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= M) {
             mWindow.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
             mWindow.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
             mWindow.setStatusBarColor(getColor(R.color.loopX_1_50_alpha));
@@ -445,6 +447,20 @@ public void onWindowFocusChanged(boolean hasFocus) {
 
     }
 
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+
+        if (keyCode == KeyEvent.KEYCODE_BACK){
+            if (loopXDragMenuLayout.getMenuStatus() == DragMenuLayout.MenuStatus.Open){
+                loopXDragMenuLayout.closeMenuWithAnimation();
+                return true;
+            }
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_MENU) {