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

Commit 06d6c1d2 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fixing new minResizeWidth/Height API"

parents 38eea1b8 324afba1

core/java/android/appwidget/AppWidgetManager.java

+8 −0
Original line number Diff line number Diff line
@@ -388,6 +388,10 @@ public class AppWidgetManager { 
                        TypedValue.complexToDimensionPixelSize(info.minWidth, mDisplayMetrics);

                info.minHeight =

                        TypedValue.complexToDimensionPixelSize(info.minHeight, mDisplayMetrics);

                info.minResizeWidth =

                    TypedValue.complexToDimensionPixelSize(info.minResizeWidth, mDisplayMetrics);

                info.minResizeHeight =

                    TypedValue.complexToDimensionPixelSize(info.minResizeHeight, mDisplayMetrics);

            }

            return providers;

        }
@@ -411,6 +415,10 @@ public class AppWidgetManager { 
                        TypedValue.complexToDimensionPixelSize(info.minWidth, mDisplayMetrics);

                info.minHeight =

                        TypedValue.complexToDimensionPixelSize(info.minHeight, mDisplayMetrics);

                info.minResizeWidth =

                    TypedValue.complexToDimensionPixelSize(info.minResizeWidth, mDisplayMetrics);

                info.minResizeHeight =

                    TypedValue.complexToDimensionPixelSize(info.minResizeHeight, mDisplayMetrics);

            }

            return info;

        }

core/java/android/appwidget/AppWidgetProviderInfo.java

+4 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ public class AppWidgetProviderInfo implements Parcelable { 
        }

        this.minWidth = in.readInt();

        this.minHeight = in.readInt();

        this.minResizeWidth = in.readInt();

        this.minResizeHeight = in.readInt();

        this.updatePeriodMillis = in.readInt();

        this.initialLayout = in.readInt();

        if (0 != in.readInt()) {
@@ -208,6 +210,8 @@ public class AppWidgetProviderInfo implements Parcelable { 
        }

        out.writeInt(this.minWidth);

        out.writeInt(this.minHeight);

        out.writeInt(this.minResizeWidth);

        out.writeInt(this.minResizeHeight);

        out.writeInt(this.updatePeriodMillis);

        out.writeInt(this.initialLayout);

        if (this.configure != null) {

services/java/com/android/server/AppWidgetService.java

+6 −0
Original line number Diff line number Diff line
@@ -230,8 +230,14 @@ class AppWidgetService extends IAppWidgetService.Stub 
                        pw.println(':');

                pw.print("    min=("); pw.print(info.minWidth);

                        pw.print("x"); pw.print(info.minHeight);

                pw.print(")   minResize=("); pw.print(info.minResizeWidth);

                        pw.print("x"); pw.print(info.minResizeHeight);

                        pw.print(") updatePeriodMillis=");

                        pw.print(info.updatePeriodMillis);

                        pw.print(" resizeMode=");

                        pw.print(info.resizeMode);

                        pw.print(" autoAdvanceViewId=");

                        pw.print(info.autoAdvanceViewId);

                        pw.print(" initialLayout=#");

                        pw.print(Integer.toHexString(info.initialLayout));

                        pw.print(" zombie="); pw.println(p.zombie);