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

core/res/res/layout/work_widget_mask_view.xml

@@ -15,12 +15,13 @@ Copyright (C) 2015 The Android Open Source Project
     limitations under the License.
 -->
 <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_height="match_parent"
     android:background="@drawable/work_widget_mask_view_background"
     android:importantForAccessibility="noHideDescendants"
-    android:clickable="true">
+    android:clickable="true"
+    android:clipToOutline="true">
 
     <com.android.internal.widget.DisableImageView
         android:id="@+id/work_widget_app_icon"

core/res/res/values/symbols.xml

@@ -2962,7 +2962,6 @@
   <java-symbol type="string" name="importance_from_person" />
 
   <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_badge_icon" />
 

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

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