Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f864d925 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by Android (Google) Code Review
Browse files

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

parents df2e2809 c0fa6bd7

core/java/com/android/internal/widget/FloatingToolbar.java

+7 −3
Original line number Diff line number Diff line
@@ -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;

    }

core/res/res/values-land/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />