summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2018-02-27 16:52:55 -0800
committerSunny Goyal <sunnygoyal@google.com>2018-02-28 17:34:23 -0800
commit2e2e2b4a6397ba2eb0f781e134ce533facc5e6fa (patch)
tree7ea3f7a56377663e1370e4a10295b13caeeab022
parentdd2424296a5639cdd707ebc2a7a830471aa4c3dd (diff)
downloadandroid_packages_apps_Trebuchet-2e2e2b4a6397ba2eb0f781e134ce533facc5e6fa.tar.gz
android_packages_apps_Trebuchet-2e2e2b4a6397ba2eb0f781e134ce533facc5e6fa.tar.bz2
android_packages_apps_Trebuchet-2e2e2b4a6397ba2eb0f781e134ce533facc5e6fa.zip
Fixing widget label not being rendered in multi-window mode
Bug: 73709754 Change-Id: Id6342e3412c2b247e052bc45c01a484422a7c011
-rw-r--r--src/com/android/launcher3/DeviceProfile.java8
-rw-r--r--src/com/android/launcher3/widget/DeferredAppWidgetHostView.java3
2 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index ba55b36a8..ea52324a5 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -250,6 +250,14 @@ public class DeviceProfile {
}
/**
+ * Inverse of {@link #getMultiWindowProfile(Context, Point)}
+ * @return device profile corresponding to the current orientation in non multi-window mode.
+ */
+ public DeviceProfile getFullScreenProfile() {
+ return isLandscape ? inv.landscapeProfile : inv.portraitProfile;
+ }
+
+ /**
* Adjusts the profile so that the labels on the Workspace are hidden.
* It is important to call this method after the All Apps variables have been set.
*/
diff --git a/src/com/android/launcher3/widget/DeferredAppWidgetHostView.java b/src/com/android/launcher3/widget/DeferredAppWidgetHostView.java
index 37e5efcb7..3a24c3d21 100644
--- a/src/com/android/launcher3/widget/DeferredAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/DeferredAppWidgetHostView.java
@@ -44,7 +44,8 @@ public class DeferredAppWidgetHostView extends LauncherAppWidgetHostView {
mPaint = new TextPaint();
mPaint.setColor(Color.WHITE);
mPaint.setTextSize(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX,
- mLauncher.getDeviceProfile().iconTextSizePx, getResources().getDisplayMetrics()));
+ mLauncher.getDeviceProfile().getFullScreenProfile().iconTextSizePx,
+ getResources().getDisplayMetrics()));
setBackgroundResource(R.drawable.bg_deferred_app_widget);
}