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

Commit 37218e1c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Increase app header height to 48dp" into main

parents 0a05a16a ea72544d

core/java/com/android/internal/policy/SystemBarUtils.java

+6 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.Insets; 
import android.view.Display;

import android.view.DisplayCutout;

import android.view.Surface;

import android.window.DesktopExperienceFlags;



import com.android.internal.R;
@@ -116,6 +117,10 @@ public final class SystemBarUtils { 
     */

    @DimenRes

    public static int getDesktopViewAppHeaderHeightId() {

        if (DesktopExperienceFlags.ENABLE_TALL_APP_HEADERS.isTrue()) {

            return R.dimen.desktop_view_default_large_header_height;

        } else {

            return R.dimen.desktop_view_default_header_height;

        }

    }

}

core/res/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -1284,8 +1284,10 @@ 
    <!-- The maximum width for a context menu icon -->

    <dimen name="list_menu_item_icon_max_width">24dp</dimen>



    <!-- Default height of desktop view header for freeform tasks on launch. -->

    <!-- Default height of desktop view's header for desktop tasks on launch. -->

    <dimen name="desktop_view_default_header_height">40dp</dimen>

    <!-- Default height of desktop view's large header for desktop tasks on launch. -->

    <dimen name="desktop_view_default_large_header_height">48dp</dimen>



    <!-- Default height of taskbar for Launcher.   -->

    <dimen name="taskbar_stashed_size">24dp</dimen>

core/res/res/values/symbols.xml

+3 −1
Original line number Diff line number Diff line
@@ -6258,8 +6258,10 @@ 
  <!-- Enable OEMs to support scale up anim across tasks.-->

  <java-symbol type="bool" name="config_enableCrossTaskScaleUpAnimation" />



  <!-- Default height of desktop view header for freeform tasks on launch. -->

  <!-- Default height of desktop view's header for desktop tasks on launch. -->

  <java-symbol type="dimen" name="desktop_view_default_header_height" />

  <!-- Default height of desktop view's large header for desktop tasks on launch. -->

  <java-symbol type="dimen" name="desktop_view_default_large_header_height" />



  <!-- Enable OEMs to support different frr notification target component activity -->

  <java-symbol type="string" name="config_fingerprintFrrTargetComponent" />

libs/WindowManager/Shell/res/layout/desktop_header_maximize_menu_button_progress_indicator_layout.xml

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
        android:progressDrawable="@drawable/circular_progress"

        android:layout_width="32dp"

        android:layout_height="32dp"

        android:layout_gravity="center"

        android:indeterminate="false"

        android:layout_marginHorizontal="6dp"

        android:layout_marginVertical="4dp"

        android:visibility="invisible"/>

</FrameLayout>

libs/WindowManager/Shell/res/values/dimen.xml

+28 −9
Original line number Diff line number Diff line
@@ -485,15 +485,9 @@ 
         end of this area. -->

    <dimen name="desktop_mode_customizable_caption_margin_start">84dp</dimen>



    <!-- When custom headers are requested, this is the width of the right-aligned region that is

         taken up by caption elements and extra margins. The customizable region ends at the

         start of this area. -->

    <dimen name="desktop_mode_customizable_caption_margin_end">152dp</dimen>



    <!-- The width of the right-aligned region that is taken up by caption elements and extra

         margins when the caption has the minimize button. This will be merged with the above value

         once the minimize button becomes default. -->

    <dimen name="desktop_mode_customizable_caption_with_minimize_button_margin_end">204dp</dimen>

    <!-- The width of the drag-only area of the app header, where apps are not allow to

         customize. -->

    <dimen name="desktop_mode_customizable_caption_drag_only_width">48dp</dimen>



    <!-- The default minimum allowed window width when resizing a window in desktop mode. -->

    <dimen name="desktop_mode_minimum_window_width">386dp</dimen>
@@ -630,6 +624,8 @@ 
    <dimen name="desktop_mode_header_buttons_ripple_radius">16dp</dimen>

    <!-- The vertical inset to apply to the app chip's ripple drawable -->

    <dimen name="desktop_mode_header_app_chip_ripple_inset_vertical">4dp</dimen>

    <!-- The vertical inset to apply to the app chip's ripple drawable in a large header -->

    <dimen name="desktop_mode_header_app_chip_ripple_inset_vertical_large">8dp</dimen>



     <!-- The corner radius of the windowing actions pill buttons's ripple drawable -->

     <dimen name="desktop_mode_handle_menu_icon_button_ripple_radius">24dp</dimen>
@@ -646,6 +642,8 @@ 
    <dimen name="desktop_mode_header_minimize_ripple_inset_vertical">4dp</dimen>

    <!-- The horizontal inset to apply to the minimize button's ripple drawable -->

    <dimen name="desktop_mode_header_minimize_ripple_inset_horizontal">6dp</dimen>

    <!-- The vertical inset to apply to the minimize button's ripple drawable in a large header -->

    <dimen name="desktop_mode_header_minimize_ripple_inset_large">8dp</dimen>



    <!-- The corner radius of the maximize button's ripple drawable -->

    <dimen name="desktop_mode_header_maximize_ripple_radius">18dp</dimen>
@@ -653,6 +651,8 @@ 
    <dimen name="desktop_mode_header_maximize_ripple_inset_vertical">4dp</dimen>

    <!-- The horizontal inset to apply to the maximize button's ripple drawable -->

    <dimen name="desktop_mode_header_maximize_ripple_inset_horizontal">6dp</dimen>

    <!-- The horizontal inset to apply to the maximize button's ripple drawable in a large header -->

    <dimen name="desktop_mode_header_maximize_ripple_inset_large">8dp</dimen>



    <!-- The corner radius of the close button's ripple drawable -->

    <dimen name="desktop_mode_header_close_ripple_radius">18dp</dimen>
@@ -660,6 +660,8 @@ 
    <dimen name="desktop_mode_header_close_ripple_inset_vertical">4dp</dimen>

    <!-- The horizontal inset to apply to the close button's ripple drawable -->

    <dimen name="desktop_mode_header_close_ripple_inset_horizontal">6dp</dimen>

    <!-- The horizontal inset to apply to the close button's ripple drawable in a large header -->

    <dimen name="desktop_mode_header_close_ripple_inset_large">8dp</dimen>



    <!-- The max width of the app name shown on the app header -->

    <dimen name="desktop_mode_header_app_name_max_width">130dp</dimen>
@@ -668,6 +670,23 @@ 
    <!-- The margin added between app name and expand menu error image on the app header -->

    <dimen name="desktop_mode_header_expand_menu_error_image_margin">8dp</dimen>



    <!-- The width of the header's window control buttons. -->

    <dimen name="desktop_mode_header_window_control_button_width">40dp</dimen>

    <!-- The height of the header's window control buttons. -->

    <dimen name="desktop_mode_header_window_control_button_height">40dp</dimen>

    <!-- The width of the header's window control buttons in a large header. -->

    <dimen name="desktop_mode_header_window_control_button_width_large">48dp</dimen>

    <!-- The height of the header's window control buttons in a large header. -->

    <dimen name="desktop_mode_header_window_control_button_height_large">48dp</dimen>

    <!-- The horizontal padding of the window control buttons of the app header. -->

    <dimen name="desktop_mode_header_window_control_button_padding_horizontal">10dp</dimen>

    <!-- The vertical padding of the window control buttons of the app header. -->

    <dimen name="desktop_mode_header_window_control_button_padding_vertical">8dp</dimen>

    <!-- The end padding of the window control buttons of the app header. -->

    <dimen name="desktop_mode_header_window_control_button_padding_end">8dp</dimen>

    <!-- The padding of the window control buttons of the large app header. -->

    <dimen name="desktop_mode_header_window_control_button_padding_large">12dp</dimen>



    <!-- The padding added to all sides of windowing education tooltip -->

    <dimen name="desktop_windowing_education_tooltip_padding">8dp</dimen>