Merge "Fix PendingWidgetHostView overlapping UI" into sc-dev

This commit is contained in:
Steven Ng 2021-06-17 09:08:15 +00:00 committed by Android (Google) Code Review
commit e8772c1659
2 changed files with 6 additions and 6 deletions

View File

@ -190,11 +190,11 @@
<!-- Widgets: -->
<skip />
<!-- Text to show user in place of a gadget when we can't display it properly -->
<string name="gadget_error_text">Problem loading widget</string>
<!-- Error text that lets a user know that the widget can't load. -->
<string name="gadget_error_text">Can\'t load widget</string>
<!-- Text to show user in place of a gadget when it is not yet initialized. -->
<string name="gadget_setup_text">Setup</string>
<!-- Instructional text to encourage a user to finish setting up the widget. -->
<string name="gadget_setup_text">Tap to finish setup</string>
<!-- Text to inform the user that they can't uninstall a system application -->
<string name="uninstall_system_app_text">This is a system app and can\'t be uninstalled.</string>

View File

@ -97,9 +97,9 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
@Override
public void updateAppWidget(RemoteViews remoteViews) {
super.updateAppWidget(remoteViews);
WidgetManagerHelper widgetManagerHelper = new WidgetManagerHelper(getContext());
if (widgetManagerHelper.isAppWidgetRestored(mInfo.appWidgetId)) {
super.updateAppWidget(remoteViews);
reInflate();
}
}
@ -149,7 +149,7 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
// The view displays three modes,
// 1) App icon in the center
// 2) Preload icon in the center
// 3) Setup icon in the center and app icon in the top right corner.
// 3) App icon in the center with a setup icon on the top left corner.
if (mDisabledForSafeMode) {
FastBitmapDrawable disabledIcon = info.newIcon(getContext());
disabledIcon.setIsDisabled(true);