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

Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev am: 3af45bd

Browse Source 
am: 73a694b

* commit '73a694b486b8b37d7e61e5ad53b3c9b139b783e9':
  Allow system apps to substitute a different app name in notifications.

Change-Id: Id47615712e65e8a11edd68dcd729824c9c37c85a
This commit is contained in:
Daniel Sandler
2016-04-14 19:29:49 +00:00
committed by android-build-merger
parent 35562f764b 73a694b486
commit aefdfa5721
4 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/java/android/app/Notification.java
View File

@@ -25,6 +25,8 @@ import android.annotation.SystemApi;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Bitmap;
@@ -960,6 +962,12 @@ public class Notification implements Parcelable
*/
public static final String EXTRA_CONTAINS_CUSTOM_VIEW = "android.contains.customView";
/**
* @SystemApi
* @hide
*/
public static final String EXTRA_SUBSTITUTE_APP_NAME = "android.substName";
private Icon mSmallIcon;
private Icon mLargeIcon;
@@ -3269,14 +3277,38 @@ public class Notification implements Parcelable
}
}
private void bindHeaderAppName(RemoteViews contentView) {
CharSequence appName = mContext.getPackageManager()
.getApplicationLabel(mContext.getApplicationInfo());
if (TextUtils.isEmpty(appName)) {
return;
private String loadHeaderAppName() {
CharSequence name = null;
final PackageManager pm = mContext.getPackageManager();
if (mN.extras.containsKey(EXTRA_SUBSTITUTE_APP_NAME)) {
// only system packages which lump together a bunch of unrelated stuff
// may substitute a different name to make the purpose of the
// notification more clear. the correct package label should always
// be accessible via SystemUI.
final String pkg = mContext.getPackageName();
final String subName = mN.extras.getString(EXTRA_SUBSTITUTE_APP_NAME);
if (PackageManager.PERMISSION_GRANTED == pm.checkPermission(
android.Manifest.permission.SUBSTITUTE_NOTIFICATION_APP_NAME, pkg)) {
name = subName;
} else {
Log.w(TAG, "warning: pkg "
+ pkg + " attempting to substitute app name '" + subName
+ "' without holding perm "
+ android.Manifest.permission.SUBSTITUTE_NOTIFICATION_APP_NAME);
}
}
contentView.setTextViewText(R.id.app_name_text, appName);
if (TextUtils.isEmpty(name)) {
name = pm.getApplicationLabel(mContext.getApplicationInfo());
}
if (TextUtils.isEmpty(name)) {
// still nothing?
return null;
}
return String.valueOf(name);
}
private void bindHeaderAppName(RemoteViews contentView) {
contentView.setTextViewText(R.id.app_name_text, loadHeaderAppName());
contentView.setTextColor(R.id.app_name_text, resolveContrastColor());
}