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

Commit 1407aeca authored by Shamali Patwa's avatar Shamali Patwa Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ls-picker-filter" into main 

* changes:
  Consider the widget option menu choice in search results
  Show only filtered / default widgets in standalone activity by default
  Add a 3 dot vertical menu and styles (child cl makes it functional)
  Set default widgets and all widgets separately from standalone activity
  Update the widget picker activity theme for popup menus styling
parents 1d75081a 6211e860

quickstep/res/values/styles.xml

+8 −2
Original line number Diff line number Diff line
@@ -312,9 +312,15 @@ 
        <item name="android:lineHeight">20sp</item>

    </style>



    <style name="WidgetPickerActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">

        <item name="widgetsTheme">@style/WidgetContainerTheme</item>

    <style name="WidgetPickerActivityTheme" parent="@android:style/Theme.DeviceDefault.DayNight">

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:windowContentOverlay">@null</item>

        <item name="android:colorBackgroundCacheHint">@null</item>

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowAnimationStyle">@android:style/Animation</item>



        <item name="widgetsTheme">@style/WidgetContainerTheme</item>

        <item name="pageIndicatorDotColor">@color/page_indicator_dot_color_light</item>

    </style>

</resources>

quickstep/src/com/android/launcher3/WidgetPickerActivity.java

+83 −61
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.appwidget.AppWidgetManager; 
import android.appwidget.AppWidgetProviderInfo;

import android.content.ClipData;

import android.content.ClipDescription;

import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.util.Log;
@@ -60,6 +61,7 @@ import java.util.Locale; 
import java.util.Map;

import java.util.Set;

import java.util.function.Function;

import java.util.function.Predicate;

import java.util.regex.Pattern;

import java.util.stream.Collectors;
@@ -128,9 +130,23 @@ public class WidgetPickerActivity extends BaseActivity { 
    /** A set of user ids that should be filtered out from the selected widgets. */

    @NonNull

    Set<Integer> mFilteredUserIds = new HashSet<>();



    @Nullable

    private WidgetsFullSheet mWidgetSheet;



    private final Predicate<WidgetItem> mWidgetsFilter = widget -> {

        final WidgetAcceptabilityVerdict verdict =

                isWidgetAcceptable(widget, /* applySizeFilter=*/ false);

        verdict.maybeLogVerdict();

        return verdict.isAcceptable;

    };

    private final Predicate<WidgetItem> mDefaultWidgetsFilter = widget -> {

        final WidgetAcceptabilityVerdict verdict =

                isWidgetAcceptable(widget, /* applySizeFilter=*/ true);

        verdict.maybeLogVerdict();

        return verdict.isAcceptable;

    };



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -276,18 +292,15 @@ public class WidgetPickerActivity extends BaseActivity { 
    private void refreshAndBindWidgets() {

        MODEL_EXECUTOR.execute(() -> {

            LauncherAppState app = LauncherAppState.getInstance(this);

            Context context = app.getContext();



            mModel.update(app, null);

            final List<WidgetsListBaseEntry> allWidgets =

                    mModel.getFilteredWidgetsListForPicker(

                            app.getContext(),

                            /*widgetItemFilter=*/ widget -> {

                                final WidgetAcceptabilityVerdict verdict =

                                        isWidgetAcceptable(widget);

                                verdict.maybeLogVerdict();

                                return verdict.isAcceptable;

                            }

                    );

            bindWidgets(allWidgets);

                    mModel.getFilteredWidgetsListForPicker(context, mWidgetsFilter);

            final List<WidgetsListBaseEntry> defaultWidgets =

                    shouldShowDefaultWidgets() ? mModel.getFilteredWidgetsListForPicker(context,

                            mDefaultWidgetsFilter) : List.of();

            bindWidgets(allWidgets, defaultWidgets);

            // Open sheet once widgets are available, so that it doesn't interrupt the open

            // animation.

            openWidgetsSheet();
@@ -307,8 +320,9 @@ public class WidgetPickerActivity extends BaseActivity { 
        });

    }



    private void bindWidgets(List<WidgetsListBaseEntry> widgets) {

        MAIN_EXECUTOR.execute(() -> mPopupDataProvider.setAllWidgets(widgets));

    private void bindWidgets(List<WidgetsListBaseEntry> allWidgets,

            List<WidgetsListBaseEntry> defaultWidgets) {

        MAIN_EXECUTOR.execute(() -> mPopupDataProvider.setAllWidgets(allWidgets, defaultWidgets));

    }



   private void openWidgetsSheet() {
@@ -380,7 +394,13 @@ public class WidgetPickerActivity extends BaseActivity { 
        }

    };



    private WidgetAcceptabilityVerdict isWidgetAcceptable(WidgetItem widget) {

    private boolean shouldShowDefaultWidgets() {

        // If optional filters such as size filter are present, we display them as default widgets.

        return mDesiredWidgetWidth != 0 || mDesiredWidgetHeight != 0;

    }



    private WidgetAcceptabilityVerdict isWidgetAcceptable(WidgetItem widget,

            boolean applySizeFilter) {

        final AppWidgetProviderInfo info = widget.widgetInfo;

        if (info == null) {

            return rejectWidget(widget, "shortcut");
@@ -401,6 +421,7 @@ public class WidgetPickerActivity extends BaseActivity { 
                    info.widgetCategory);

        }



        if (applySizeFilter) {

            if (mDesiredWidgetWidth == 0 && mDesiredWidgetHeight == 0) {

                // Accept the widget if the desired dimensions are unspecified.

                return acceptWidget(widget);
@@ -457,6 +478,7 @@ public class WidgetPickerActivity extends BaseActivity { 
            if (!isHorizontallyResizable || !isVerticallyResizable) {

                return rejectWidget(widget, "not resizeable");

            }

        }



        return acceptWidget(widget);

    }

res/drawable/ic_more_vert_dots.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />

</vector>
 
 No newline at end of file

res/layout/widgets_two_pane_sheet_paged_view.xml

+27 −6
Original line number Diff line number Diff line
@@ -55,19 +55,40 @@ 
            android:clipToOutline="true"

            android:orientation="vertical">



            <FrameLayout

            <LinearLayout

                android:id="@+id/search_bar_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:background="?attr/widgetPickerPrimarySurfaceColor"

                android:gravity="center_vertical"

                launcher:layout_sticky="true">

                <FrameLayout

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"

                    android:clipToPadding="false"

                    android:elevation="0.1dp"

                android:paddingBottom="8dp"

                launcher:layout_sticky="true">

                    android:paddingBottom="8dp">



                    <include layout="@layout/widgets_search_bar" />

                </FrameLayout>



                <ImageButton

                    android:id="@+id/widget_picker_widget_options_menu"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:layout_marginStart="8dp"

                    android:layout_marginBottom="8dp"

                    android:layout_gravity="bottom"

                    android:background="@drawable/full_rounded_transparent_ripple"

                    android:contentDescription="@string/widget_picker_widget_options_button_description"

                    android:padding="12dp"

                    android:src="@drawable/ic_more_vert_dots"

                    android:visibility="gone"

                    android:tint="?attr/widgetPickerWidgetOptionsMenuColor" />

            </LinearLayout>



            <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="match_parent"

res/layout/widgets_two_pane_sheet_recyclerview.xml

+27 −6
Original line number Diff line number Diff line
@@ -39,20 +39,41 @@ 
            android:clipToOutline="true"

            android:orientation="vertical">



            <FrameLayout

            <LinearLayout

                android:id="@+id/search_bar_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center_vertical"

                android:orientation="horizontal"

                android:background="?attr/widgetPickerPrimarySurfaceColor"

                android:clipToPadding="false"

                android:elevation="0.1dp"

                android:paddingBottom="16dp"

                android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"

                launcher:layout_sticky="true">

                <FrameLayout

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"

                    android:clipToPadding="false"

                    android:elevation="0.1dp"

                    android:paddingBottom="16dp">



                    <include layout="@layout/widgets_search_bar" />

                </FrameLayout>



                <ImageButton

                    android:id="@+id/widget_picker_widget_options_menu"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:layout_marginStart="8dp"

                    android:layout_marginBottom="16dp"

                    android:layout_gravity="bottom"

                    android:background="@drawable/full_rounded_transparent_ripple"

                    android:contentDescription="@string/widget_picker_widget_options_button_description"

                    android:padding="12dp"

                    android:src="@drawable/ic_more_vert_dots"

                    android:visibility="gone"

                    android:tint="?attr/widgetPickerWidgetOptionsMenuColor" />

            </LinearLayout>



            <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="match_parent"