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

Commit 7c7be8c2 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Simplifying options popup and overview handling 

> Removing support for page drag-n-drop from pagedView
> Removing Overview UI from Launcher3 without quickstep and using options popup instead
> Removing touch handlers from CellLayouts and showing options popup based on workspace long press
> Excluding touch outside inset when showing the popup

Bug: 74136505
Change-Id: I34c2a7ff58452db26f5d1a85d554be40fc75f2b8
parent fad58c81

quickstep/res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


<resources>



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



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

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

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

quickstep/src/com/android/launcher3/uioverrides/UiFactory.java

+0 −8
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.launcher3.uioverrides; 


import static com.android.launcher3.LauncherState.NORMAL;



import android.graphics.PointF;

import android.view.View;

import android.view.View.AccessibilityDelegate;
@@ -34,9 +33,6 @@ import com.android.quickstep.RecentsView; 


public class UiFactory {



    private static final String CONTROL_REMOTE_APP_TRANSITION_PERMISSION =

            "android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS";



    public static TouchController[] createTouchControllers(Launcher launcher) {

        if (FeatureFlags.ENABLE_TWO_SWIPE_TARGETS) {

            return new TouchController[] {
@@ -60,10 +56,6 @@ public class UiFactory { 
                new RecentsViewStateController(launcher)};

    }



    public static void onWorkspaceLongPress(Launcher launcher, PointF touchPoint) {

        OptionsPopupView.show(launcher, touchPoint.x, touchPoint.y);

    }



    public static void onLauncherStateOrFocusChanged(Launcher launcher) {

        boolean shouldBackButtonBeVisible = launcher == null

                || !launcher.isInState(NORMAL)

quickstep/res/layout/longpress_options_menu.xml→res/layout/longpress_options_menu.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.uioverrides.OptionsPopupView

<com.android.launcher3.views.OptionsPopupView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"
@@ -94,4 +94,4 @@ 


    </FrameLayout>



</com.android.launcher3.uioverrides.OptionsPopupView>
 
 No newline at end of file
 
</com.android.launcher3.views.OptionsPopupView>
 
 No newline at end of file

res/layout/overview_panel.xml

+3 −57
Original line number Diff line number Diff line
@@ -14,61 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.uioverrides.OverviewPanel

<Space

      xmlns:android="http://schemas.android.com/apk/res/android"

      android:theme="@style/HomeScreenElementTheme"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_gravity="center_horizontal|bottom"

      android:gravity="top"

      android:orientation="horizontal">



    <TextView

        android:id="@+id/wallpaper_button"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:drawablePadding="4dp"

        android:drawableTop="@drawable/ic_wallpaper"

        android:drawableTint="?attr/workspaceTextColor"

        android:fontFamily="sans-serif-condensed"

        android:gravity="center_horizontal"

        android:stateListAnimator="@animator/overview_button_anim"

        android:text="@string/wallpaper_button_text"

        android:textAllCaps="true"

        android:textColor="?attr/workspaceTextColor"

        android:textSize="12sp" />



    <TextView

        android:id="@+id/widget_button"

      android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:drawablePadding="4dp"

        android:drawableTop="@drawable/ic_widget"

        android:drawableTint="?attr/workspaceTextColor"

        android:fontFamily="sans-serif-condensed"

        android:gravity="center_horizontal"

        android:stateListAnimator="@animator/overview_button_anim"

        android:text="@string/widget_button_text"

        android:textAllCaps="true"

        android:textColor="?attr/workspaceTextColor"

        android:textSize="12sp" />



    <TextView

        android:id="@+id/settings_button"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:drawablePadding="4dp"

        android:drawableTop="@drawable/ic_setting"

        android:drawableTint="?attr/workspaceTextColor"

        android:fontFamily="sans-serif-condensed"

        android:gravity="center_horizontal"

        android:stateListAnimator="@animator/overview_button_anim"

        android:text="@string/settings_button_text"

        android:textAllCaps="true"

        android:textColor="?attr/workspaceTextColor"

        android:textSize="12sp" />



</com.android.launcher3.uioverrides.OverviewPanel>
 
 No newline at end of file
 
      android:layout_height="0dp" />
 
 No newline at end of file

res/values-land/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
    <dimen name="fastscroll_popup_text_size">24dp</dimen>



    <!-- Dynamic grid -->

    <dimen name="dynamic_grid_overview_bar_item_width">120dp</dimen>

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

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