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

am f864d925: Merge "Set FloatingToolbar width for portrait and landscape." into mnc-dev

Browse Source 
* commit 'f864d925bf861d8ae19ed91deeebf30741d286c5':
  Set FloatingToolbar width for portrait and landscape.
This commit is contained in:
Abodunrinwa Toki
2015-05-11 15:39:58 +00:00
committed by Android Git Automerger
parent 100cf21fce f864d925bf
commit 33808e8ba7
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/internal/widget/FloatingToolbar.java
View File

@@ -1247,9 +1247,13 @@ public final class FloatingToolbar {
}
private static int getAdjustedToolbarWidth(Context context, int width) {
if (width <= 0 || width > getScreenWidth(context)) {
width = context.getResources()
.getDimensionPixelSize(R.dimen.floating_toolbar_default_width);
int maximumWidth = getScreenWidth(context) - 2 * context.getResources()
.getDimensionPixelSize(R.dimen.floating_toolbar_horizontal_margin);
if (width <= 0 || width > maximumWidth) {
int defaultWidth = context.getResources()
.getDimensionPixelSize(R.dimen.floating_toolbar_preferred_width);
width = Math.min(defaultWidth, maximumWidth);
}
return width;
}

3
core/res/res/values-land/dimens.xml
View File

@@ -67,4 +67,7 @@
<!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->
<dimen name="immersive_mode_cling_width">380dp</dimen>
<!-- Floating toolbar dimensions -->
<dimen name="floating_toolbar_preferred_width">544dp</dimen>
</resources>

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

@@ -391,7 +391,7 @@
<dimen name="floating_toolbar_overflow_side_padding">18dp</dimen>
<dimen name="floating_toolbar_text_size">14sp</dimen>
<dimen name="floating_toolbar_menu_button_minimum_width">48dp</dimen>
<dimen name="floating_toolbar_default_width">264dp</dimen>
<dimen name="floating_toolbar_preferred_width">328dp</dimen>
<dimen name="floating_toolbar_minimum_overflow_height">144dp</dimen>
<dimen name="floating_toolbar_horizontal_margin">16dp</dimen>
<dimen name="floating_toolbar_vertical_margin">8dp</dimen>

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

@@ -2241,7 +2241,7 @@
<java-symbol type="dimen" name="floating_toolbar_overflow_side_padding" />
<java-symbol type="dimen" name="floating_toolbar_text_size" />
<java-symbol type="dimen" name="floating_toolbar_menu_button_minimum_width" />
<java-symbol type="dimen" name="floating_toolbar_default_width" />
<java-symbol type="dimen" name="floating_toolbar_preferred_width" />
<java-symbol type="dimen" name="floating_toolbar_minimum_overflow_height" />
<java-symbol type="dimen" name="floating_toolbar_horizontal_margin" />
<java-symbol type="dimen" name="floating_toolbar_vertical_margin" />