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

Commit 1de0e3d1 authored by Alex Chau's avatar Alex Chau
Browse files

Move desktop_windowing_freeform_rounded_corner_radius to shared 

- So it can be accessed by Launcher

Fix: 384517710
Test: Builds and runs
Flag: EXEMPT BUG_FIX
Change-Id: Ibb5bfdf5d45aad76a0d83dc8e1036a2f1c2ba6bd
parent c26379f2

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

+0 −3
Original line number Diff line number Diff line
@@ -670,7 +670,4 @@ 
    <dimen name="desktop_windowing_education_promo_height">352dp</dimen>

    <!-- The corner radius of the desktop windowing education promo. -->

    <dimen name="desktop_windowing_education_promo_corner_radius">28dp</dimen>



    <!-- The corner radius of freeform tasks in desktop windowing. -->

    <dimen name="desktop_windowing_freeform_rounded_corner_radius">16dp</dimen>

</resources>

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

+3 −0
Original line number Diff line number Diff line
@@ -45,4 +45,7 @@ 
    <dimen name="drop_target_expanded_view_height">578</dimen>

    <dimen name="drop_target_expanded_view_padding_bottom">108</dimen>

    <dimen name="drop_target_expanded_view_padding_horizontal">24</dimen>



    <!-- The corner radius of freeform tasks in desktop windowing. -->

    <dimen name="desktop_windowing_freeform_rounded_corner_radius">16dp</dimen>

</resources>
 
 No newline at end of file

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+4 −1
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ import com.android.wm.shell.recents.RecentsTransitionHandler 
import com.android.wm.shell.recents.RecentsTransitionStateListener

import com.android.wm.shell.recents.RecentsTransitionStateListener.RecentsTransitionState

import com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_NOT_RUNNING

import com.android.wm.shell.shared.R as SharedR

import com.android.wm.shell.shared.TransitionUtil

import com.android.wm.shell.shared.annotations.ExternalThread

import com.android.wm.shell.shared.annotations.ShellDesktopThread
@@ -2017,7 +2018,9 @@ class DesktopTasksController( 
        }

        val cornerRadius =

            context.resources

                .getDimensionPixelSize(R.dimen.desktop_windowing_freeform_rounded_corner_radius)

                .getDimensionPixelSize(

                    SharedR.dimen.desktop_windowing_freeform_rounded_corner_radius

                )

                .toFloat()

        info.changes

            .filter { it.taskInfo?.windowingMode == WINDOWING_MODE_FREEFORM }

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.os.IResultReceiver;

import com.android.internal.protolog.ProtoLog;

import com.android.wm.shell.Flags;

import com.android.wm.shell.R;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.pip.PipUtils;

import com.android.wm.shell.protolog.ShellProtoLogGroup;

import com.android.wm.shell.shared.R;

import com.android.wm.shell.shared.TransitionUtil;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.transition.HomeTransitionObserver;

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+2 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
    private static int getCornerRadius(@NonNull Context context, int layoutResId) {

        if (layoutResId == R.layout.desktop_mode_app_header) {

            return loadDimensionPixelSize(context.getResources(),

                    R.dimen.desktop_windowing_freeform_rounded_corner_radius);

                    com.android.wm.shell.shared.R.dimen

                            .desktop_windowing_freeform_rounded_corner_radius);

        }

        return INVALID_CORNER_RADIUS;

    }