Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Setup button bar padding before empty state handling" into rvc-dev

Browse Source
This commit is contained in:
Antoan Angelov
2020-06-05 10:04:52 +00:00
committed by Android (Google) Code Review
parent 6017da0fb3 5d9ca17ddc
commit 16fce9c63b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -1819,6 +1819,12 @@ public class ResolverActivity extends Activity implements
ResolverListAdapter activeListAdapter = ResolverListAdapter activeListAdapter =
mMultiProfilePagerAdapter.getActiveListAdapter(); mMultiProfilePagerAdapter.getActiveListAdapter();
View buttonBarDivider = findViewById(R.id.resolver_button_bar_divider); View buttonBarDivider = findViewById(R.id.resolver_button_bar_divider);
if (!useLayoutWithDefault()) {
int inset = mSystemWindowInsets != null ? mSystemWindowInsets.bottom : 0;
buttonLayout.setPadding(buttonLayout.getPaddingLeft(), buttonLayout.getPaddingTop(),
buttonLayout.getPaddingRight(), getResources().getDimensionPixelSize(
R.dimen.resolver_button_bar_spacing) + inset);
}
if (activeListAdapter.isTabLoaded() if (activeListAdapter.isTabLoaded()
&& mMultiProfilePagerAdapter.shouldShowEmptyStateScreen(activeListAdapter) && mMultiProfilePagerAdapter.shouldShowEmptyStateScreen(activeListAdapter)
&& !useLayoutWithDefault()) { && !useLayoutWithDefault()) {
@@ -1835,12 +1841,6 @@ public class ResolverActivity extends Activity implements
buttonLayout.setVisibility(View.VISIBLE); buttonLayout.setVisibility(View.VISIBLE);
setButtonBarIgnoreOffset(/* ignoreOffset */ true); setButtonBarIgnoreOffset(/* ignoreOffset */ true);
if (!useLayoutWithDefault()) {
int inset = mSystemWindowInsets != null ? mSystemWindowInsets.bottom : 0;
buttonLayout.setPadding(buttonLayout.getPaddingLeft(), buttonLayout.getPaddingTop(),
buttonLayout.getPaddingRight(), getResources().getDimensionPixelSize(
R.dimen.resolver_button_bar_spacing) + inset);
}
mOnceButton = (Button) buttonLayout.findViewById(R.id.button_once); mOnceButton = (Button) buttonLayout.findViewById(R.id.button_once);
mAlwaysButton = (Button) buttonLayout.findViewById(R.id.button_always); mAlwaysButton = (Button) buttonLayout.findViewById(R.id.button_always);