PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev

Browse Source 
am: 9234a34a80

Change-Id: I25a0968edf534242130fdfda405bb6dfb8afc24a
This commit is contained in:
Hyunyoung Song
2017-04-11 19:42:47 +00:00
committed by android-build-merger
parent af95b3d3c2 9234a34a80
commit 71ba393033
5 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/applications/AppHeaderController.java
View File

@@ -24,6 +24,8 @@ import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.graphics.Outline;
import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.support.annotation.IntDef;
@@ -31,6 +33,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewOutlineProvider;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
@@ -61,12 +64,23 @@ public class AppHeaderController {
public static final String PREF_KEY_APP_HEADER = "pref_app_header";
public static final ViewOutlineProvider OUTLINE_PROVIDER = new ViewOutlineProvider() {
@Override
public void getOutline(View view, Outline outline) {
Drawable background = ((ImageView)view).getDrawable();
if (background != null) {
background.getOutline(outline);
}
}
};
private static final String TAG = "AppDetailFeature";
private final Context mContext;
private final Fragment mFragment;
private final int mMetricsCategory;
private final View mAppHeader;
private final int mIconElevation;
private Drawable mIcon;
private CharSequence mLabel;
@@ -93,6 +107,8 @@ public class AppHeaderController {
mAppHeader = LayoutInflater.from(fragment.getContext())
.inflate(R.layout.app_details, null /* root */);
}
mIconElevation = mContext.getResources()
.getDimensionPixelSize(R.dimen.launcher_icon_elevation);
}
public AppHeaderController setIcon(Drawable icon) {
@@ -212,6 +228,13 @@ public class AppHeaderController {
ImageView iconView = (ImageView) mAppHeader.findViewById(R.id.app_detail_icon);
if (iconView != null) {
iconView.setImageDrawable(mIcon);
if (mIcon instanceof AdaptiveIconDrawable) {
iconView.setElevation(mIconElevation);
iconView.setOutlineProvider(OUTLINE_PROVIDER);
} else {
iconView.setElevation(0);
iconView.setOutlineProvider(null);
}
ImageView badgeView = mAppHeader.findViewById(R.id.app_icon_instant_apps_badge);
if (badgeView != null) {
badgeView.setVisibility(mIsInstantApp ? View.VISIBLE : View.GONE);

9
src/com/android/settings/applications/ManageApplications.java
View File

@@ -23,6 +23,7 @@ import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.AdaptiveIconDrawable;
import android.icu.text.AlphabeticIndex;
import android.os.Bundle;
import android.os.Environment;
@@ -34,6 +35,7 @@ import android.preference.PreferenceFrameLayout;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.LauncherIcons;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -90,7 +92,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.Set;
@@ -812,6 +813,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
private final AppStateBaseBridge mExtraInfoBridge;
private final Handler mBgHandler;
private final Handler mFgHandler;
private final LauncherIcons mLauncherIcons;
private int mFilterMode;
private ArrayList<ApplicationsState.AppEntry> mBaseEntries;
private ArrayList<ApplicationsState.AppEntry> mEntries;
@@ -866,6 +869,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
mContext = manageApplications.getActivity();
mPm = mContext.getPackageManager();
mFilterMode = filterMode;
mLauncherIcons = new LauncherIcons(mContext);
if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
mExtraInfoBridge = new AppStateNotificationBridge(mContext, mState, this,
manageApplications.mNotifBackend);
@@ -1300,6 +1304,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
}
mState.ensureIcon(entry);
if (entry.icon != null) {
if (entry.icon instanceof AdaptiveIconDrawable) {
entry.icon = mLauncherIcons.wrapIconDrawableWithShadow(entry.icon);
}
holder.appIcon.setImageDrawable(entry.icon);
}
updateSummary(holder);