Remove flag 'fix_empty_state_padding_bug'

And the other original (unused) flag without the '_bug' suffix.

Bug: 377522331
Flag: NONE released flag removal
Test: NONE no functional change
Change-Id: I6109a91a87c95681951cd254c0e470047c5b1741

2 files changed, 2 insertions, 22 deletions

diff --git a/aconfig/FeatureFlags.aconfig b/aconfig/FeatureFlags.aconfig
index dfe1bb2d..2a526875 100644
--- a/aconfig/FeatureFlags.aconfig
+++ b/aconfig/FeatureFlags.aconfig
@@ -36,23 +36,6 @@ flag {
 }
 
 flag {
-  name: "fix_empty_state_padding"
-  namespace: "intentresolver"
-  description: "Always apply systemBar window insets regardless of profiles present"
-  bug: "338447666"
-}
-
-flag {
-  name: "fix_empty_state_padding_bug"
-  namespace: "intentresolver"
-  description: "Always apply systemBar window insets regardless of profiles present"
-  bug: "338447666"
-  metadata {
-    purpose: PURPOSE_BUGFIX
-  }
-}
-
-flag {
   name: "fix_missing_drawer_offset_calculation"
   namespace: "intentresolver"
   description: "Recalculate drawer offset upon the preview size change when the targets list remains unchanged"
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index e9e43dae..c97d3124 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -24,7 +24,6 @@ import static androidx.lifecycle.LifecycleKt.getCoroutineScope;
 
 import static com.android.intentresolver.ChooserActionFactory.EDIT_SOURCE;
 import static com.android.intentresolver.Flags.fixDrawerOffsetOnConfigChange;
-import static com.android.intentresolver.Flags.fixEmptyStatePaddingBug;
 import static com.android.intentresolver.Flags.fixMissingDrawerOffsetCalculation;
 import static com.android.intentresolver.Flags.fixShortcutsFlashing;
 import static com.android.intentresolver.Flags.keyboardNavigationFix;
@@ -2688,10 +2687,8 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
 
     protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
         mSystemWindowInsets = insets.getInsets(WindowInsets.Type.systemBars());
-        if (fixEmptyStatePaddingBug() || mProfiles.getWorkProfilePresent()) {
-            mChooserMultiProfilePagerAdapter
-                    .setEmptyStateBottomOffset(mSystemWindowInsets.bottom);
-        }
+        mChooserMultiProfilePagerAdapter
+                .setEmptyStateBottomOffset(mSystemWindowInsets.bottom);
 
         mResolverDrawerLayout.setPadding(mSystemWindowInsets.left, mSystemWindowInsets.top,
                 mSystemWindowInsets.right, 0);