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

Commit 2426a605 authored by mattsziklay's avatar mattsziklay
Browse files

Remove Screenshot and Bubble menu options. 

Currently, these two menu options are not implemented and have no
function(i.e, they are not used for developer purposes like Select
currently is). This CL removes them so as to not be distracting.

Bug: 286550932
Test: Manual; confirm options are gone and pill heights are correct.

Change-Id: Ic9377e8bae70c8093353fc1a0c154b43a222607b
parent 6b9593c3

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

+2 −2
Original line number Diff line number Diff line
@@ -435,10 +435,10 @@ 
    <dimen name="desktop_mode_handle_menu_windowing_pill_height">52dp</dimen>



    <!-- The height of the handle menu's "More Actions" pill in desktop mode, but not freeform. -->

    <dimen name="desktop_mode_handle_menu_more_actions_pill_height">156dp</dimen>

    <dimen name="desktop_mode_handle_menu_more_actions_pill_height">104dp</dimen>



    <!-- The height of the handle menu's "More Actions" pill in freeform desktop windowing mode. -->

    <dimen name="desktop_mode_handle_menu_more_actions_pill_freeform_height">104dp</dimen>

    <dimen name="desktop_mode_handle_menu_more_actions_pill_freeform_height">52dp</dimen>



    <!-- The top margin of the handle menu in desktop mode. -->

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

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

+6 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ class HandleMenu { 
            final ImageButton splitscreenBtn = windowingPillView.findViewById(

                    R.id.split_screen_button);

            final ImageButton floatingBtn = windowingPillView.findViewById(R.id.floating_button);

            // TODO: Remove once implemented.

            floatingBtn.setVisibility(View.GONE);



            final ImageButton desktopBtn = windowingPillView.findViewById(R.id.desktop_button);

            fullscreenBtn.setOnClickListener(mOnClickListener);

            splitscreenBtn.setOnClickListener(mOnClickListener);
@@ -196,6 +199,9 @@ class HandleMenu { 
        }

        final Button selectBtn = moreActionsPillView.findViewById(R.id.select_button);

        selectBtn.setOnClickListener(mOnClickListener);

        final Button screenshotBtn = moreActionsPillView.findViewById(R.id.screenshot_button);

        // TODO: Remove once implemented.

        screenshotBtn.setVisibility(View.GONE);

    }



    /**