diff options
| -rw-r--r-- | aconfig/FeatureFlags.aconfig | 10 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserActivity.java | 7 |
2 files changed, 1 insertions, 16 deletions
diff --git a/aconfig/FeatureFlags.aconfig b/aconfig/FeatureFlags.aconfig index 2a526875..f4fc0630 100644 --- a/aconfig/FeatureFlags.aconfig +++ b/aconfig/FeatureFlags.aconfig @@ -26,16 +26,6 @@ flag { } flag { - name: "fix_drawer_offset_on_config_change" - namespace: "intentresolver" - description: "Fix drawer offset calculation after rotating when in a non-initial tab" - bug: "344057117" - 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 c97d3124..c2c7dfab 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -23,7 +23,6 @@ import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTE 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.fixMissingDrawerOffsetCalculation; import static com.android.intentresolver.Flags.fixShortcutsFlashing; import static com.android.intentresolver.Flags.keyboardNavigationFix; @@ -2327,11 +2326,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements updateTabPadding(); } - int currentProfile = mChooserMultiProfilePagerAdapter.getActiveProfile(); - int initialProfile = fixDrawerOffsetOnConfigChange() - ? mInitialProfile - : findSelectedProfile(); - if (currentProfile != initialProfile) { + if (mChooserMultiProfilePagerAdapter.getActiveProfile() != mInitialProfile) { return; } |