From 9fd8fae9f98c744bbf5cf6667aafe550dabbea24 Mon Sep 17 00:00:00 2001
From: Dhina17 <dhinalogu@gmail.com>
Date: Tue, 7 May 2024 05:19:09 +0000
Subject: [PATCH] SystemUI: Use correct back drawable for 2-button nav

- This reverts 6e9302f7f47d0b3bceee6ef2a63acbd0fae68a9c
- We do support 2-button nav and we don't use gesture nav as default so
  SuW issue mentioned in the reverted commit does not affect us.

Change-Id: Ibec3ed2e9344d78d41d6d9c86d7f9d6677a47a5a
---
 .../com/android/systemui/navigationbar/NavigationBarView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
index 4f511c2ce180..615efc108813 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
@@ -612,7 +612,9 @@ public class NavigationBarView extends FrameLayout implements DragDropSurfaceCal
     }
 
     public KeyButtonDrawable getBackDrawable() {
-        KeyButtonDrawable drawable = getDrawable(R.drawable.ic_sysbar_back);
+        KeyButtonDrawable drawable = mShowSwipeUpUi
+                ? getDrawable(R.drawable.ic_sysbar_back_quick_step)
+                : getDrawable(R.drawable.ic_sysbar_back);
         orientBackButton(drawable);
         return drawable;
     }
-- 
GitLab