Merge "Resolver - Fix bottom spacing issue with edge-to-edge" into qt-dev am: ea73bddd5b

am: ab343a10eb

Change-Id: I251212668ecd890b523b1dfc426b1d15487db625
This commit is contained in:
Matt Pietal
2019-05-28 05:47:05 -07:00
committed by android-build-merger
4 changed files with 6 additions and 3 deletions

View File

@@ -1319,7 +1319,8 @@ public class ResolverActivity extends Activity {
buttonLayout.setVisibility(View.VISIBLE);
int inset = mSystemWindowInsets != null ? mSystemWindowInsets.bottom : 0;
buttonLayout.setPadding(buttonLayout.getPaddingLeft(), buttonLayout.getPaddingTop(),
buttonLayout.getPaddingRight(), buttonLayout.getPaddingBottom() + inset);
buttonLayout.getPaddingRight(), getResources().getDimensionPixelSize(
R.dimen.resolver_button_bar_spacing) + inset);
mOnceButton = (Button) buttonLayout.findViewById(R.id.button_once);
mSettingsButton = (Button) buttonLayout.findViewById(R.id.button_app_settings);

View File

@@ -100,8 +100,8 @@
android:layoutDirection="locale"
android:measureWithLargestChild="true"
android:background="?attr/colorBackgroundFloating"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingTop="@dimen/resolver_button_bar_spacing"
android:paddingBottom="@dimen/resolver_button_bar_spacing"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:elevation="8dp">

View File

@@ -742,6 +742,7 @@
<dimen name="chooser_preview_image_border">1dp</dimen>
<dimen name="chooser_preview_width">-1px</dimen>
<dimen name="resolver_icon_size">42dp</dimen>
<dimen name="resolver_button_bar_spacing">8dp</dimen>
<dimen name="resolver_badge_size">18dp</dimen>
<dimen name="chooser_target_width">90dp</dimen>
<dimen name="chooser_header_scroll_elevation">4dp</dimen>

View File

@@ -3775,6 +3775,7 @@
<java-symbol type="drawable" name="iconfactory_adaptive_icon_drawable_wrapper"/>
<java-symbol type="dimen" name="resolver_icon_size"/>
<java-symbol type="dimen" name="resolver_badge_size"/>
<java-symbol type="dimen" name="resolver_button_bar_spacing"/>
<!-- For DropBox -->
<java-symbol type="integer" name="config_dropboxLowPriorityBroadcastRateLimitPeriod" />