diff options
Diffstat (limited to 'src/com/android/launcher3')
6 files changed, 19 insertions, 11 deletions
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index 0ba94995b..daeca3bef 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -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); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index e41152752..245b39909 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -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; diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java index c78908273..570607ec7 100644 --- a/src/com/android/launcher3/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java @@ -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()); + } } diff --git a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java index fcb714ff1..de06ab664 100644 --- a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java +++ b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java @@ -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; diff --git a/src/com/android/launcher3/widget/WidgetHostViewLoader.java b/src/com/android/launcher3/widget/WidgetHostViewLoader.java index b47ba84fc..297505be2 100644 --- a/src/com/android/launcher3/widget/WidgetHostViewLoader.java +++ b/src/com/android/launcher3/widget/WidgetHostViewLoader.java @@ -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); diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java index ac9d62e9a..5d8adf504 100644 --- a/src/com/android/launcher3/widget/WidgetsListAdapter.java +++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java @@ -138,7 +138,7 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> { WidgetCell widget = (WidgetCell) row.getChildAt(i); if (infoList.get(i) instanceof LauncherAppWidgetProviderInfo) { LauncherAppWidgetProviderInfo info = (LauncherAppWidgetProviderInfo) infoList.get(i); - PendingAddWidgetInfo pawi = new PendingAddWidgetInfo(mLauncher, info, null); + PendingAddWidgetInfo pawi = new PendingAddWidgetInfo(mLauncher, info); widget.setTag(pawi); widget.applyFromAppWidgetProviderInfo(info, mWidgetPreviewLoader); } else if (infoList.get(i) instanceof ResolveInfo) { |