diff --git a/packages/SystemUI/res/drawable/people_space_content_background.xml b/packages/SystemUI/res/drawable/people_space_content_background.xml new file mode 100644 index 0000000000000..5310840939b86 --- /dev/null +++ b/packages/SystemUI/res/drawable/people_space_content_background.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/people_space_round_tile_view_card.xml b/packages/SystemUI/res/drawable/people_space_round_tile_view_card.xml new file mode 100644 index 0000000000000..59af7750dada3 --- /dev/null +++ b/packages/SystemUI/res/drawable/people_space_round_tile_view_card.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/people_space_rounded_border.xml b/packages/SystemUI/res/drawable/people_space_rounded_border.xml new file mode 100644 index 0000000000000..9956bc2eb2ac4 --- /dev/null +++ b/packages/SystemUI/res/drawable/people_space_rounded_border.xml @@ -0,0 +1,19 @@ + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/people_space_tile_view_card.xml b/packages/SystemUI/res/drawable/people_space_tile_view_card.xml index 4772ae76179ec..8fd4388fd01d5 100644 --- a/packages/SystemUI/res/drawable/people_space_tile_view_card.xml +++ b/packages/SystemUI/res/drawable/people_space_tile_view_card.xml @@ -14,6 +14,6 @@ ~ limitations under the License. --> - + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/people_space_widget_background.xml b/packages/SystemUI/res/drawable/people_space_widget_background.xml index b9293598bd00c..fa457187990eb 100644 --- a/packages/SystemUI/res/drawable/people_space_widget_background.xml +++ b/packages/SystemUI/res/drawable/people_space_widget_background.xml @@ -18,7 +18,7 @@ android:shape="rectangle" > - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/layout/people_space_small_avatar_tile.xml b/packages/SystemUI/res/layout/people_space_small_avatar_tile.xml new file mode 100644 index 0000000000000..f47483054ea34 --- /dev/null +++ b/packages/SystemUI/res/layout/people_space_small_avatar_tile.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/layout/people_space_widget_item.xml b/packages/SystemUI/res/layout/people_space_widget_item.xml index 95de6d61e3ddf..170386f5ecc5a 100644 --- a/packages/SystemUI/res/layout/people_space_widget_item.xml +++ b/packages/SystemUI/res/layout/people_space_widget_item.xml @@ -16,6 +16,7 @@ --> + android:layout_width="60dp" + android:layout_height="60dp" /> - + + + + diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 57e1d43bc6ef0..3b1fe4a7ddf35 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1303,6 +1303,7 @@ 16dp 12.5dp - 10dp + 24dp + 100dp 6dp diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java index 5f3ceb198dc4e..dddd39b172092 100644 --- a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java +++ b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java @@ -111,8 +111,6 @@ public class PeopleSpaceUtils { context, notificationManager, mPeopleManager, mLauncherApps); for (int appWidgetId : appWidgetIds) { - RemoteViews views = new RemoteViews(context.getPackageName(), - R.layout.people_space_widget_item); String shortcutId = sp.getString(String.valueOf(appWidgetId), null); if (DEBUG) { Log.d(TAG, "Set widget: " + appWidgetId + " with shortcut ID: " + shortcutId); @@ -127,6 +125,8 @@ public class PeopleSpaceUtils { continue; } PeopleSpaceTile tile = entry.get().getValue(); + RemoteViews views = new RemoteViews(context.getPackageName(), + getLayout(tile)); String status = PeopleSpaceUtils.getLastInteractionString(context, entry.get().getKey()); @@ -158,6 +158,12 @@ public class PeopleSpaceUtils { } } + /** Returns the layout ID for the {@code tile}. */ + private static int getLayout(PeopleSpaceTile tile) { + return tile.getNotification() == null ? R.layout.people_space_large_avatar_tile : + R.layout.people_space_small_avatar_tile; + } + /** Returns a list sorted by ascending last interaction time from {@code stream}. */ private static List> getSortedTiles( IPeopleManager peopleManager, Stream stream) {