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

Set theme and support dark mode in People widgets

Browse Source 
Change-Id: Ib0e60b2aa613a515a5371694fae933e122c1666d
Bug: 184022942
Test: locally
This commit is contained in:
Anna Zappone
2021-04-07 19:25:19 +00:00
parent 6fb83178e0
commit b370170fdb
7 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/people_space_placeholder_layout.xml
View File

@@ -14,6 +14,7 @@
~ limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

1
packages/SystemUI/res/layout/people_tile_large_empty.xml
View File

@@ -14,6 +14,7 @@
~ limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:layout_width="match_parent"
android:layout_height="match_parent">

2
packages/SystemUI/res/layout/people_tile_large_with_content.xml
View File

@@ -14,6 +14,7 @@
~ limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:id="@+id/item"
android:background="@drawable/people_space_tile_view_card"
android:layout_width="match_parent"
@@ -90,6 +91,7 @@
<ImageView
android:id="@+id/predefined_icon"
android:tint="?android:attr/colorAccent"
android:gravity="start|center_vertical"
android:paddingEnd="6dp"
android:layout_width="24dp"

1
packages/SystemUI/res/layout/people_tile_medium_empty.xml
View File

@@ -15,6 +15,7 @@
~ limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

2
packages/SystemUI/res/layout/people_tile_medium_with_content.xml
View File

@@ -16,6 +16,7 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -129,6 +130,7 @@
/>
<ImageView
android:id="@+id/predefined_icon"
android:tint="?android:attr/colorAccent"
android:gravity="end|center_vertical"
android:paddingStart="6dp"
android:layout_width="24dp"

2
packages/SystemUI/res/layout/people_tile_small.xml
View File

@@ -14,6 +14,7 @@
~ limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -38,6 +39,7 @@
<ImageView
android:id="@+id/predefined_icon"
android:tint="?android:attr/colorAccent"
android:layout_gravity="center"
android:layout_width="18dp"
android:layout_height="22dp"

21
packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java
View File

@@ -33,6 +33,7 @@ import static android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH;
import static com.android.systemui.people.PeopleSpaceUtils.convertDrawableToBitmap;
import static com.android.systemui.people.PeopleSpaceUtils.getUserId;
import android.annotation.ColorInt;
import android.annotation.Nullable;
import android.app.PendingIntent;
import android.app.people.ConversationStatus;
@@ -40,6 +41,7 @@ import android.app.people.PeopleSpaceTile;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
@@ -48,12 +50,13 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.util.IconDrawableFactory;
import android.util.Log;
import android.util.TypedValue;
import android.view.ContextThemeWrapper;
import android.view.View;
import android.widget.RemoteViews;
import android.widget.TextView;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.Utils;
import com.android.systemui.R;
import com.android.systemui.people.widget.LaunchConversationActivity;
import com.android.systemui.people.widget.PeopleSpaceWidgetProvider;
@@ -344,10 +347,11 @@ class PeopleTileViewHelper {
setMaxLines(views);
CharSequence content = mTile.getNotificationContent();
views = setPunctuationRemoteViewsFields(views, content);
TypedValue typedValue = new TypedValue();
mContext.getTheme().resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
int primaryTextColor = mContext.getColor(typedValue.resourceId);
views.setInt(R.id.text_content, "setTextColor", primaryTextColor);
// TODO(b/184931139): Update to RemoteViews wrapper to set via attribute once available
@ColorInt int color = Utils.getColorAttr(mContext,
android.R.attr.textColorPrimary).getDefaultColor();
views.setInt(R.id.text_content, "setTextColor", color);
views.setTextViewText(R.id.text_content, mTile.getNotificationContent());
views.setViewVisibility(R.id.image, View.GONE);
views.setImageViewResource(R.id.predefined_icon, R.drawable.ic_message);
@@ -393,10 +397,9 @@ class PeopleTileViewHelper {
views.setViewVisibility(R.id.predefined_icon, View.VISIBLE);
setMaxLines(views);
// Secondary text color for statuses.
TypedValue typedValue = new TypedValue();
mContext.getTheme().resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
int secondaryTextColor = mContext.getColor(typedValue.resourceId);
views.setInt(R.id.text_content, "setTextColor", secondaryTextColor);
@ColorInt int secondaryColor = Utils.getColorAttr(mContext,
android.R.attr.textColorSecondary).getDefaultColor();
views.setInt(R.id.text_content, "setTextColor", secondaryColor);
views.setTextViewText(R.id.text_content, statusText);
Icon statusIcon = status.getIcon();