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

Commit 16466f1b authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Adding UI tests for various bind widget flows 

Change-Id: I634302051886baee6b6424f69bc95db860b4823e
parent 77b3e1a5

src/com/android/launcher3/AppWidgetResizeFrame.java

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ public class AppWidgetResizeFrame extends FrameLayout implements View.OnKeyListe 
                sTmpRect.right, sTmpRect.bottom);

    }



    public static Rect getWidgetSizeRanges(Launcher launcher, int spanX, int spanY, Rect rect) {

    public static Rect getWidgetSizeRanges(Context context, int spanX, int spanY, Rect rect) {

        if (sCellSize == null) {

            InvariantDeviceProfile inv = LauncherAppState.getInstance().getInvariantDeviceProfile();
@@ -376,7 +376,7 @@ public class AppWidgetResizeFrame extends FrameLayout implements View.OnKeyListe 
        if (rect == null) {

            rect = new Rect();

        }

        final float density = launcher.getResources().getDisplayMetrics().density;

        final float density = context.getResources().getDisplayMetrics().density;



        // Compute landscape size

        int landWidth = (int) ((spanX * sCellSize[0].x) / density);

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -4013,7 +4013,7 @@ public class Launcher extends Activity 
                // Note: This assumes that the id remap broadcast is received before this step.

                // If that is not the case, the id remap will be ignored and user may see the

                // click to setup view.

                PendingAddWidgetInfo pendingInfo = new PendingAddWidgetInfo(this, appWidgetInfo, null);

                PendingAddWidgetInfo pendingInfo = new PendingAddWidgetInfo(this, appWidgetInfo);

                pendingInfo.spanX = item.spanX;

                pendingInfo.spanY = item.spanY;

                pendingInfo.minSpanX = item.minSpanX;

src/com/android/launcher3/LauncherAppWidgetHostView.java

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.view.View; 
import android.view.ViewConfiguration;

import android.view.ViewDebug;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.RemoteViews;



import com.android.launcher3.dragndrop.DragLayer;
@@ -291,4 +292,10 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView implements Touc 
            });

        }

    }



    @Override

    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

        info.setClassName(getClass().getName());

    }

}

src/com/android/launcher3/widget/PendingAddWidgetInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.launcher3.widget;



import android.appwidget.AppWidgetHostView;

import android.content.Context;

import android.os.Bundle;

import android.os.Parcelable;
@@ -37,14 +38,14 @@ public class PendingAddWidgetInfo extends PendingAddItemInfo { 
    public AppWidgetHostView boundWidget;

    public Bundle bindOptions = null;



    public PendingAddWidgetInfo(Launcher launcher, LauncherAppWidgetProviderInfo i, Parcelable data) {

    public PendingAddWidgetInfo(Context context, LauncherAppWidgetProviderInfo i) {

        if (i.isCustomWidget) {

            itemType = LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;

        } else {

            itemType = LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET;

        }

        this.info = i;

        user = AppWidgetManagerCompat.getInstance(launcher).getUser(i);

        user = AppWidgetManagerCompat.getInstance(context).getUser(i);

        componentName = i.provider;

        previewImage = i.previewImage;

        icon = i.icon;

src/com/android/launcher3/widget/WidgetHostViewLoader.java

+5 −5
Original line number Diff line number Diff line
@@ -151,15 +151,15 @@ public class WidgetHostViewLoader implements DragController.DragListener { 
        return true;

    }



    public static Bundle getDefaultOptionsForWidget(Launcher launcher, PendingAddWidgetInfo info) {

    public static Bundle getDefaultOptionsForWidget(Context context, PendingAddWidgetInfo info) {

        Bundle options = null;

        Rect rect = new Rect();

        if (Utilities.ATLEAST_JB_MR1) {

            AppWidgetResizeFrame.getWidgetSizeRanges(launcher, info.spanX, info.spanY, rect);

            Rect padding = AppWidgetHostView.getDefaultPaddingForWidget(launcher,

            Rect rect = new Rect();

            AppWidgetResizeFrame.getWidgetSizeRanges(context, info.spanX, info.spanY, rect);

            Rect padding = AppWidgetHostView.getDefaultPaddingForWidget(context,

                    info.componentName, null);



            float density = launcher.getResources().getDisplayMetrics().density;

            float density = context.getResources().getDisplayMetrics().density;

            int xPaddingDips = (int) ((padding.left + padding.right) / density);

            int yPaddingDips = (int) ((padding.top + padding.bottom) / density);