Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct AppWidget layout when WP is off" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-19 17:26:37 +00:00
committed by Android (Google) Code Review
parent af8ef20fe7 2debc0a849
commit 175302bb89
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/res/layout/work_widget_mask_view.xml
View File

@@ -15,12 +15,13 @@ Copyright (C) 2015 The Android Open Source Project
limitations under the License. limitations under the License.
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/work_widget_mask_frame" android:id="@android:id/background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/work_widget_mask_view_background" android:background="@drawable/work_widget_mask_view_background"
android:importantForAccessibility="noHideDescendants" android:importantForAccessibility="noHideDescendants"
android:clickable="true"> android:clickable="true"
android:clipToOutline="true">
<com.android.internal.widget.DisableImageView <com.android.internal.widget.DisableImageView
android:id="@+id/work_widget_app_icon" android:id="@+id/work_widget_app_icon"

1
core/res/res/values/symbols.xml
View File

@@ -2962,7 +2962,6 @@
<java-symbol type="string" name="importance_from_person" /> <java-symbol type="string" name="importance_from_person" />
<java-symbol type="layout" name="work_widget_mask_view" /> <java-symbol type="layout" name="work_widget_mask_view" />
<java-symbol type="id" name="work_widget_mask_frame" />
<java-symbol type="id" name="work_widget_app_icon" /> <java-symbol type="id" name="work_widget_app_icon" />
<java-symbol type="id" name="work_widget_badge_icon" /> <java-symbol type="id" name="work_widget_badge_icon" />

2
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -554,7 +554,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
} }
if (onClickIntent != null) { if (onClickIntent != null) {
views.setOnClickPendingIntent(R.id.work_widget_mask_frame, views.setOnClickPendingIntent(android.R.id.background,
PendingIntent.getActivity(mContext, 0, onClickIntent, PendingIntent.getActivity(mContext, 0, onClickIntent,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE));
} }