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

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

Browse Source 
am: ea73bddd5b

Change-Id: Ib68d80ac81a4d112d7bdf3ab7f7a65d45fc7861d
This commit is contained in:
Matt Pietal
2019-05-28 05:42:07 -07:00
committed by android-build-merger
parent 3e21934d65 ea73bddd5b
commit fef3b40787
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1319,7 +1319,8 @@ public class ResolverActivity extends Activity {
buttonLayout.setVisibility(View.VISIBLE); buttonLayout.setVisibility(View.VISIBLE);
int inset = mSystemWindowInsets != null ? mSystemWindowInsets.bottom : 0; int inset = mSystemWindowInsets != null ? mSystemWindowInsets.bottom : 0;
buttonLayout.setPadding(buttonLayout.getPaddingLeft(), buttonLayout.getPaddingTop(), 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); mOnceButton = (Button) buttonLayout.findViewById(R.id.button_once);
mSettingsButton = (Button) buttonLayout.findViewById(R.id.button_app_settings); mSettingsButton = (Button) buttonLayout.findViewById(R.id.button_app_settings);

4
core/res/res/layout/resolver_list.xml
View File

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

1
core/res/res/values/dimens.xml
View File

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

1
core/res/res/values/symbols.xml
View File

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