From 7b63d6ec1b8ea720cf3e46f38cdc1ac6d99dd7ff Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Thu, 12 Dec 2019 10:26:49 -0500 Subject: [PATCH] [DO NOT MERGE] Resolver/Chooser - Fix 'no apps available' inset When zero apps match a filter, the empty view is set to visible and shown. There is harm in making sure the inset always get applied to the empty view so that when resolver determines it needs to be visible, it is set to be shown. Test: atest ResolverActivityTest, ChooserActivityTest Bug: 146133961 Change-Id: I7412df84f8f482219635ccd73dff8e4a21355a18 --- .../com/android/internal/app/ResolverActivity.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 3a9d4d545e78b..bef60d97ad9cd 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -414,13 +414,13 @@ public class ResolverActivity extends Activity { mFooterSpacer.setLayoutParams(new AbsListView.LayoutParams(LayoutParams.MATCH_PARENT, mSystemWindowInsets.bottom)); ((ListView) mAdapterView).addFooterView(mFooterSpacer); - } else { - View emptyView = findViewById(R.id.empty); - if (emptyView != null) { - emptyView.setPadding(0, 0, 0, mSystemWindowInsets.bottom - + getResources().getDimensionPixelSize( - R.dimen.chooser_edge_margin_normal) * 2); - } + } + + View emptyView = findViewById(R.id.empty); + if (emptyView != null) { + emptyView.setPadding(0, 0, 0, mSystemWindowInsets.bottom + + getResources().getDimensionPixelSize( + R.dimen.chooser_edge_margin_normal) * 2); } return insets.consumeSystemWindowInsets();