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

Polish updates

Browse Source 
- Fix strings for accessibility
- Use newly added targetCellHeight and reduce placeholder padding to fit
the lower cell heights of some devices
- Remove shadow from Work Profile badged icon

Bug: 184857890, 185137298, 185891880
Test: local
Change-Id: Ia0b93c80b1019c805b9644bb1d51b009fc529ebe
This commit is contained in:
Anna Zappone
2021-04-22 20:05:35 +00:00
parent 502c75489d
commit 1889a57132
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@
android:orientation="horizontal"
android:gravity="center"
android:layout_gravity="top"
android:paddingVertical="16dp"
android:paddingVertical="8dp"
android:paddingHorizontal="16dp"
android:layout_width="match_parent"
android:layout_height="match_parent">

6
packages/SystemUI/res/values/strings.xml
View File

@@ -2904,15 +2904,15 @@
<!-- Status text on the Conversation widget for a birthday today [CHAR LIMIT=20] -->
<string name="birthday_status">Birthday</string>
<!-- Content description text on the Conversation widget for a birthday today [CHAR LIMIT=150] -->
<string name="birthday_status_content_description">It\’s <xliff:g id="name" example="Anna">%1$s</xliff:g>\’s birthday</string>
<string name="birthday_status_content_description">It\'s <xliff:g id="name" example="Anna">%1$s</xliff:g>\’s birthday</string>
<!-- Status text on the Conversation widget for an upcoming birthday [CHAR LIMIT=20] -->
<string name="upcoming_birthday_status">Birthday soon</string>
<!-- Content description text on the Conversation widget for an upcoming birthday [CHAR LIMIT=150] -->
<string name="upcoming_birthday_status_content_description">It\’s <xliff:g id="name" example="Anna">%1$s</xliff:g>\’s birthday soon</string>
<string name="upcoming_birthday_status_content_description">It\'s <xliff:g id="name" example="Anna">%1$s</xliff:g>\’s birthday soon</string>
<!-- Status text on the Conversation widget for an anniversary [CHAR LIMIT=20] -->
<string name="anniversary_status">Anniversary</string>
<!-- Content description text on the Conversation widget for an anniversary [CHAR LIMIT=150] -->
<string name="anniversary_status_content_description">It\’s <xliff:g id="name" example="Anna">%1$s</xliff:g>\’s anniversary</string>
<string name="anniversary_status_content_description">It\'s <xliff:g id="name" example="Anna">%1$s</xliff:g>\’s anniversary</string>
<!-- Status text on the Conversation widget for sharing location [CHAR LIMIT=20] -->
<string name="location_status">Sharing location</string>
<!-- Content description text on the Conversation widget for sharing location [CHAR LIMIT=150] -->

2
packages/SystemUI/res/xml/people_space_widget_info.xml
View File

@@ -16,7 +16,7 @@
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:minWidth="136dp"
android:minHeight="55dp"
android:targetCellHeight="1"
android:minResizeWidth="60dp"
android:minResizeHeight="50dp"
android:maxResizeHeight="207dp"

22
packages/SystemUI/src/com/android/systemui/people/PeopleStoryIconFactory.java
View File

@@ -23,16 +23,17 @@ import android.content.pm.PackageManager;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.util.IconDrawableFactory;
import android.util.Log;
import android.util.TypedValue;
import com.android.launcher3.icons.BaseIconFactory;
import com.android.settingslib.Utils;
import com.android.systemui.R;
class PeopleStoryIconFactory extends BaseIconFactory {
class PeopleStoryIconFactory implements AutoCloseable {
private static final int PADDING = 2;
private static final int RING_WIDTH = 2;
@@ -44,11 +45,13 @@ class PeopleStoryIconFactory extends BaseIconFactory {
private int mAccentColor;
private float mDensity;
private float mIconSize;
private Context mContext;
private final int mIconBitmapSize;
PeopleStoryIconFactory(Context context, PackageManager pm,
IconDrawableFactory iconDrawableFactory, int iconSizeDp) {
super(context, context.getResources().getConfiguration().densityDpi,
(int) (iconSizeDp * context.getResources().getDisplayMetrics().density));
mIconBitmapSize = (int) (iconSizeDp * context.getResources().getDisplayMetrics().density);
mDensity = context.getResources().getDisplayMetrics().density;
mIconSize = mDensity * iconSizeDp;
mPackageManager = pm;
@@ -57,6 +60,7 @@ class PeopleStoryIconFactory extends BaseIconFactory {
TypedValue typedValue = new TypedValue();
context.getTheme().resolveAttribute(android.R.attr.colorAccent, typedValue, true);
mAccentColor = context.getColor(typedValue.resourceId);
mContext = context;
}
@@ -69,7 +73,7 @@ class PeopleStoryIconFactory extends BaseIconFactory {
try {
final ApplicationInfo appInfo = mPackageManager.getApplicationInfoAsUser(
packageName, PackageManager.GET_META_DATA, userId);
badge = mIconDrawableFactory.getBadgedIcon(appInfo, userId);
badge = Utils.getBadgedIcon(mContext, appInfo);
} catch (PackageManager.NameNotFoundException e) {
badge = mPackageManager.getDefaultActivityIcon();
}
@@ -209,7 +213,11 @@ class PeopleStoryIconFactory extends BaseIconFactory {
@Override
public int getOpacity() {
return 0;
return PixelFormat.TRANSLUCENT;
}
}
}
@Override
public void close() {
}
}