Make extra navigation bar count towards non decor frame (3/3)

This is the final step to actually make task bar as navigation bars.
This requires all automated test moved to a newer version of UI
automator to avoid missing the area of task bar. Without that, dozens of
tests will fail because the UI Automator cannot correctly click in the
area of task bar.

Also, this partially reverted commit
bc0d5539e6ce80bb686dd38f6517f9c2dcd77aa0.

Test: PlatformScenarioTests
Test: TaplTestsQuickstep, ThemeIconsTest, TaplTestsLauncher3
Bug: 238981445
Bug: 238985243
Bug: 238581838
Bug: 233945217
Change-Id: Ibdd343418eeabebdae09153beeaffb975264ad43

1 files changed, 0 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index b26de07461d6..22a43b92a84f 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -2111,12 +2111,10 @@ public class DisplayPolicy {
             }
         }
 
-        // TODO (b/235842600): Use public type once we can treat task bar as navigation bar.
         static final int[] INTERNAL_DECOR_TYPES;
         static {
             final ArraySet<Integer> decorTypes = InsetsState.toInternalType(
                     Type.displayCutout() | Type.navigationBars());
-            decorTypes.remove(ITYPE_EXTRA_NAVIGATION_BAR);
             INTERNAL_DECOR_TYPES = new int[decorTypes.size()];
             for (int i = 0; i < INTERNAL_DECOR_TYPES.length; i++) {
                 INTERNAL_DECOR_TYPES[i] = decorTypes.valueAt(i);
@@ -2149,7 +2147,6 @@ public class DisplayPolicy {
             }
         }
 
-        // TODO (b/235842600): Remove this method once we can treat task bar as navigation bar.
         private static Insets calculateDecorInsetsWithInternalTypes(InsetsState state) {
             final Rect frame = state.getDisplayFrame();
             Insets insets = Insets.NONE;