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

Commit ecdf6575 authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Add more education tips for widgets. (3/3)

Show tip on reconfigurable widget in launcher.

Bug: 185354491
Test: Manually tested tips in widget picker, all apps, and
reconfigurable widgets tip.

Change-Id: I08154c944285cac6a21c3ef4aafd878bbbccf44b
parent 14e1f2a6
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -28,13 +28,14 @@
        android:padding="16dp"
        android:background="@drawable/arrow_toast_rounded_background"
        android:elevation="2dp"
        android:outlineProvider="none"
        android:textColor="@color/arrow_tip_view_content"
        android:textSize="14sp"/>

    <View
        android:id="@+id/arrow"
        android:elevation="2dp"
        android:outlineProvider="none"
        android:layout_width="@dimen/arrow_toast_arrow_width"
        android:layout_height="8dp"
        android:layout_marginTop="-2dp"/>
        android:layout_height="10dp"/>
</merge>
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2009 The Android Open Source Project
<!-- Copyright (C) 2021 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.
+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@
    <dimen name="widget_reconfigure_button_padding">6dp</dimen>
    <dimen name="widget_reconfigure_button_margin">32dp</dimen>
    <dimen name="widget_reconfigure_button_size">36dp</dimen>
    <dimen name="widget_reconfigure_tip_top_margin">16dp</dimen>

<!-- Fast scroll -->
    <dimen name="fastscroll_track_min_width">6dp</dimen>
+5 −0
Original line number Diff line number Diff line
@@ -105,6 +105,11 @@
    <!-- Dialog text. This dialog lets a user know how they can use widgets on their phone.
         [CHAR_LIMIT=NONE] -->
    <string name="widget_education_content">To get info without opening apps, you can add widgets to your Home screen</string>

    <!-- Text on an educational tip on widget informing users that they can change widget settings.
         [CHAR_LIMIT=NONE] -->
    <string name="reconfigurable_widget_education_tip">Tap to change widget settings</string>

    <!-- Text on the button that closes the education dialog about widgets. [CHAR_LIMIT=50] -->
    <string name="widget_education_close_button">Got it</string>

+29 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.launcher3.logging.InstanceId;
import com.android.launcher3.logging.InstanceIdSequence;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.util.PendingRequestArgs;
import com.android.launcher3.views.ArrowTipView;
import com.android.launcher3.widget.LauncherAppWidgetHostView;
import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
import com.android.launcher3.widget.util.WidgetSizes;
@@ -42,6 +43,8 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
    private static final float DIMMED_HANDLE_ALPHA = 0f;
    private static final float RESIZE_THRESHOLD = 0.66f;

    private static final String KEY_RECONFIGURABLE_WIDGET_EDUCATION_TIP_SEEN =
            "launcher.reconfigurable_widget_education_tip_seen";
    private static final Rect sTmpRect = new Rect();

    private static final int HANDLE_COUNT = 4;
@@ -238,6 +241,15 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
                            mWidgetView.getAppWidgetId(),
                            Launcher.REQUEST_RECONFIGURE_APPWIDGET);
            });
            if (!hasSeenReconfigurableWidgetEducationTip()) {
                post(() -> {
                    if (showReconfigurableWidgetEducationTip() != null) {
                        mLauncher.getSharedPrefs().edit()
                                .putBoolean(KEY_RECONFIGURABLE_WIDGET_EDUCATION_TIP_SEEN,
                                        true).apply();
                    }
                });
            }
        }

        // When we create the resize frame, we first mark all cells as unoccupied. The appropriate
@@ -679,4 +691,21 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
                || keyCode == KeyEvent.KEYCODE_MOVE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_END
                || keyCode == KeyEvent.KEYCODE_PAGE_UP || keyCode == KeyEvent.KEYCODE_PAGE_DOWN);
    }

    private ArrowTipView showReconfigurableWidgetEducationTip() {
        int[] coords = new int[2];
        mReconfigureButton.getLocationOnScreen(coords);
        int tipTopMargin = mLauncher.getResources()
                .getDimensionPixelSize(R.dimen.widget_reconfigure_tip_top_margin);
        return new ArrowTipView(mLauncher, /* isPointingUp= */ true).showAtLocation(
                getContext().getString(R.string.reconfigurable_widget_education_tip),
                /* arrowXCoord= */ coords[0] + mReconfigureButton.getWidth() / 2,
                /* yCoord= */ coords[1] + mReconfigureButton.getHeight() + tipTopMargin);
    }

    private boolean hasSeenReconfigurableWidgetEducationTip() {
        return mLauncher.getSharedPrefs()
                .getBoolean(KEY_RECONFIGURABLE_WIDGET_EDUCATION_TIP_SEEN, false)
                || Utilities.IS_RUNNING_IN_TEST_HARNESS;
    }
}
Loading