From 8952e2b0cdf362a9afb813f2c4ed20f998d474f5 Mon Sep 17 00:00:00 2001
From: Alexander <eltex.developers@gmail.com>
Date: Fri, 20 Sep 2019 16:07:27 +0700
Subject: [PATCH] Close DrawerLayout on back button press

---
 .../main/java/org/schabi/newpipe/MainActivity.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index c24d77d03..3c18c25f6 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -20,6 +20,7 @@
 
 package org.schabi.newpipe;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -29,6 +30,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -59,6 +62,7 @@ import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.FireTvUtils;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
@@ -408,13 +412,20 @@ public class MainActivity extends AppCompatActivity {
     public void onBackPressed() {
         if (DEBUG) Log.d(TAG, "onBackPressed() called");
 
+        if (FireTvUtils.isFireTv()) {
+            View drawerPanel = findViewById(R.id.navigation_layout);
+            if (drawer.isDrawerOpen(drawerPanel)) {
+                drawer.closeDrawers();
+                return;
+            }
+        }
+
         Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
         // If current fragment implements BackPressable (i.e. can/wanna handle back press) delegate the back press to it
         if (fragment instanceof BackPressable) {
             if (((BackPressable) fragment).onBackPressed()) return;
         }
 
-
         if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
             finish();
         } else super.onBackPressed();