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

Implement advanced icon style for output switch

Browse Source 
This CL add new type "TYPE_ADVANCED" in AdaptiveOutlineDrawable.
It use to customize icon for output switch.

Bug: 157208551
Test: make -j42 RunSettingsLibRoboTests
Change-Id: I06bfacf2fc6e798648a94117d3e861a807650a5a
This commit is contained in:
Hugh Chen
2020-05-29 16:25:42 +08:00
parent 27630cbb4e
commit eb06dfd70e
10 changed files with 151 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/AdaptiveIcon/res/values/colors.xml
View File

@@ -18,4 +18,8 @@
<color name="homepage_generic_icon_background">#1A73E8</color>
<color name="bt_outline_color">#1f000000</color> <!-- icon outline color -->
<color name="advanced_outline_color">#BDC1C6</color> <!-- icon outline color -->
<color name="advanced_icon_color">#3C4043</color>
</resources>

2
packages/SettingsLib/AdaptiveIcon/res/values/dimens.xml
View File

@@ -18,6 +18,8 @@
<resources>
<!-- Dashboard foreground image inset (from background edge to foreground edge) -->
<dimen name="dashboard_tile_foreground_image_inset">6dp</dimen>
<!-- Advanced dashboard foreground image inset (from background edge to foreground edge) -->
<dimen name="advanced_dashboard_tile_foreground_image_inset">9dp</dimen>
<!-- Stroke size of adaptive outline -->
<dimen name="adaptive_outline_stroke">1dp</dimen>

80
packages/SettingsLib/AdaptiveIcon/src/com/android/settingslib/widget/AdaptiveOutlineDrawable.java
View File

@@ -16,6 +16,10 @@
package com.android.settingslib.widget;
import static com.android.settingslib.widget.AdaptiveOutlineDrawable.AdaptiveOutlineIconType.TYPE_ADVANCED;
import static com.android.settingslib.widget.AdaptiveOutlineDrawable.AdaptiveOutlineIconType.TYPE_DEFAULT;
import android.annotation.ColorInt;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
@@ -27,35 +31,90 @@ import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.DrawableWrapper;
import android.util.PathParser;
import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* Adaptive outline drawable with white plain background color and black outline
*/
public class AdaptiveOutlineDrawable extends DrawableWrapper {
@Retention(RetentionPolicy.SOURCE)
@IntDef({TYPE_DEFAULT, TYPE_ADVANCED})
public @interface AdaptiveOutlineIconType {
int TYPE_DEFAULT = 0;
int TYPE_ADVANCED = 1;
}
@VisibleForTesting
final Paint mOutlinePaint;
Paint mOutlinePaint;
private Path mPath;
private final int mInsetPx;
private final Bitmap mBitmap;
private int mInsetPx;
private int mStrokeWidth;
private Bitmap mBitmap;
private int mType;
public AdaptiveOutlineDrawable(Resources resources, Bitmap bitmap) {
super(new AdaptiveIconShapeDrawable(resources));
init(resources, bitmap, TYPE_DEFAULT);
}
public AdaptiveOutlineDrawable(Resources resources, Bitmap bitmap,
@AdaptiveOutlineIconType int type) {
super(new AdaptiveIconShapeDrawable(resources));
init(resources, bitmap, type);
}
private void init(Resources resources, Bitmap bitmap,
@AdaptiveOutlineIconType int type) {
mType = type;
getDrawable().setTint(Color.WHITE);
mPath = new Path(PathParser.createPathFromPathData(
resources.getString(com.android.internal.R.string.config_icon_mask)));
mStrokeWidth = resources.getDimensionPixelSize(R.dimen.adaptive_outline_stroke);
mOutlinePaint = new Paint();
mOutlinePaint.setColor(resources.getColor(R.color.bt_outline_color, null));
mOutlinePaint.setColor(getColor(resources, type));
mOutlinePaint.setStyle(Paint.Style.STROKE);
mOutlinePaint.setStrokeWidth(resources.getDimension(R.dimen.adaptive_outline_stroke));
mOutlinePaint.setStrokeWidth(mStrokeWidth);
mOutlinePaint.setAntiAlias(true);
mInsetPx = resources
.getDimensionPixelSize(R.dimen.dashboard_tile_foreground_image_inset);
mInsetPx = getDimensionPixelSize(resources, type);
mBitmap = bitmap;
}
private @ColorInt int getColor(Resources resources, @AdaptiveOutlineIconType int type) {
int resId;
switch (type) {
case TYPE_ADVANCED:
resId = R.color.advanced_outline_color;
break;
case TYPE_DEFAULT:
default:
resId = R.color.bt_outline_color;
break;
}
return resources.getColor(resId, /* theme */ null);
}
private int getDimensionPixelSize(Resources resources, @AdaptiveOutlineIconType int type) {
int resId;
switch (type) {
case TYPE_ADVANCED:
resId = R.dimen.advanced_dashboard_tile_foreground_image_inset;
break;
case TYPE_DEFAULT:
default:
resId = R.dimen.dashboard_tile_foreground_image_inset;
break;
}
return resources.getDimensionPixelSize(resId);
}
@Override
public void draw(Canvas canvas) {
super.draw(canvas);
@@ -68,7 +127,12 @@ public class AdaptiveOutlineDrawable extends DrawableWrapper {
final int count = canvas.save();
canvas.scale(scaleX, scaleY);
// Draw outline
canvas.drawPath(mPath, mOutlinePaint);
if (mType == TYPE_DEFAULT) {
canvas.drawPath(mPath, mOutlinePaint);
} else {
canvas.drawCircle(2 * mInsetPx, 2 * mInsetPx, 2 * mInsetPx - mStrokeWidth,
mOutlinePaint);
}
canvas.restoreToCount(count);
// Draw the foreground icon

3
packages/SettingsLib/res/values/dimens.xml
View File

@@ -94,4 +94,7 @@
<!-- Define minimal size of the tap area -->
<dimen name="min_tap_target_size">48dp</dimen>
<!-- Size of advanced icon -->
<dimen name="advanced_icon_size">18dp</dimen>
</resources>

43
packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
View File

@@ -1,5 +1,7 @@
package com.android.settingslib.bluetooth;
import static com.android.settingslib.widget.AdaptiveOutlineDrawable.AdaptiveOutlineIconType.TYPE_ADVANCED;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
@@ -7,6 +9,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@@ -212,6 +215,46 @@ public class BluetoothUtils {
return new Pair<>(pair.first, pair.second);
}
/**
* Build device icon with advanced outline
*/
public static Drawable buildAdvancedDrawable(Context context, Drawable drawable) {
final int iconSize = context.getResources().getDimensionPixelSize(
R.dimen.advanced_icon_size);
final Resources resources = context.getResources();
Bitmap bitmap = null;
if (drawable instanceof BitmapDrawable) {
bitmap = ((BitmapDrawable) drawable).getBitmap();
} else {
final int width = drawable.getIntrinsicWidth();
final int height = drawable.getIntrinsicHeight();
bitmap = createBitmap(drawable,
width > 0 ? width : 1,
height > 0 ? height : 1);
}
if (bitmap != null) {
final Bitmap resizedBitmap = Bitmap.createScaledBitmap(bitmap, iconSize,
iconSize, false);
bitmap.recycle();
return new AdaptiveOutlineDrawable(resources, resizedBitmap, TYPE_ADVANCED);
}
return drawable;
}
/**
* Creates a drawable with specified width and height.
*/
public static Bitmap createBitmap(Drawable drawable, int width, int height) {
final Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
final Canvas canvas = new Canvas(bitmap);
drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
drawable.draw(canvas);
return bitmap;
}
/**
* Get boolean Bluetooth metadata
*

13
packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java
View File

@@ -21,7 +21,6 @@ import android.content.Context;
import android.graphics.drawable.Drawable;
import android.media.MediaRoute2Info;
import android.media.MediaRouter2Manager;
import android.util.Pair;
import com.android.settingslib.R;
import com.android.settingslib.bluetooth.BluetoothUtils;
@@ -57,13 +56,11 @@ public class BluetoothMediaDevice extends MediaDevice {
@Override
public Drawable getIcon() {
final Pair<Drawable, String> pair = BluetoothUtils
.getBtRainbowDrawableWithDescription(mContext, mCachedDevice);
return isFastPairDevice()
? pair.first
: BluetoothUtils.buildBtRainbowDrawable(mContext,
mContext.getDrawable(R.drawable.ic_headphone),
mCachedDevice.getAddress().hashCode());
final Drawable drawable = getIconWithoutBackground();
if (!isFastPairDevice()) {
setColorFilter(drawable);
}
return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);
}
@Override

6
packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java
View File

@@ -55,9 +55,9 @@ public class InfoMediaDevice extends MediaDevice {
@Override
public Drawable getIcon() {
//TODO(b/120669861): Return remote device icon uri once api is ready.
return BluetoothUtils.buildBtRainbowDrawable(mContext,
mContext.getDrawable(getDrawableResId()), getId().hashCode());
final Drawable drawable = getIconWithoutBackground();
setColorFilter(drawable);
return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);
}
@Override

13
packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
View File

@@ -31,6 +31,9 @@ import static android.media.MediaRoute2Info.TYPE_WIRED_HEADPHONES;
import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable;
import android.media.MediaRoute2Info;
import android.media.MediaRouter2Manager;
@@ -39,6 +42,8 @@ import android.text.TextUtils;
import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import com.android.settingslib.R;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -131,6 +136,14 @@ public abstract class MediaDevice implements Comparable<MediaDevice> {
getId());
}
void setColorFilter(Drawable drawable) {
final ColorStateList list =
mContext.getResources().getColorStateList(
R.color.advanced_icon_color, mContext.getTheme());
drawable.setColorFilter(new PorterDuffColorFilter(list.getDefaultColor(),
PorterDuff.Mode.SRC_IN));
}
/**
* Get name from MediaDevice.
*

7
packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
View File

@@ -85,8 +85,9 @@ public class PhoneMediaDevice extends MediaDevice {
@Override
public Drawable getIcon() {
return BluetoothUtils.buildBtRainbowDrawable(mContext,
mContext.getDrawable(getDrawableResId()), getId().hashCode());
final Drawable drawable = getIconWithoutBackground();
setColorFilter(drawable);
return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);
}
@Override
@@ -105,7 +106,7 @@ public class PhoneMediaDevice extends MediaDevice {
case TYPE_HDMI:
case TYPE_WIRED_HEADSET:
case TYPE_WIRED_HEADPHONES:
resId = com.android.internal.R.drawable.ic_bt_headphones_a2dp;
resId = R.drawable.ic_headphone;
break;
case TYPE_BUILTIN_SPEAKER:
default:

6
packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/PhoneMediaDeviceTest.java
View File

@@ -79,13 +79,11 @@ public class PhoneMediaDeviceTest {
public void getDrawableResId_returnCorrectResId() {
when(mInfo.getType()).thenReturn(TYPE_WIRED_HEADPHONES);
assertThat(mPhoneMediaDevice.getDrawableResId())
.isEqualTo(com.android.internal.R.drawable.ic_bt_headphones_a2dp);
assertThat(mPhoneMediaDevice.getDrawableResId()).isEqualTo(R.drawable.ic_headphone);
when(mInfo.getType()).thenReturn(TYPE_WIRED_HEADSET);
assertThat(mPhoneMediaDevice.getDrawableResId())
.isEqualTo(com.android.internal.R.drawable.ic_bt_headphones_a2dp);
assertThat(mPhoneMediaDevice.getDrawableResId()).isEqualTo(R.drawable.ic_headphone);
when(mInfo.getType()).thenReturn(TYPE_BUILTIN_SPEAKER);