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

Merge "AOD: Implement redacted notificatinos" into oc-dev

Browse Source 
am: 89e8b7b58e

Change-Id: I92526d3c656647fa42c0a6266d4d33f035e54c9f
This commit is contained in:
Adrian Roos
2017-04-18 00:50:02 +00:00
committed by android-build-merger
parent a8647cb547 89e8b7b58e
commit 0ded7c8578
5 changed files with 74 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4202,9 +4202,22 @@ public class Notification implements Parcelable
* @hide
*/
public RemoteViews makePublicContentView() {
return makePublicView(false /* ambient */);
}
/**
* Construct a RemoteViews for the display in public contexts like on the lockscreen.
*
* @hide
*/
public RemoteViews makePublicAmbientNotification() {
return makePublicView(true /* ambient */);
}
private RemoteViews makePublicView(boolean ambient) {
if (mN.publicVersion != null) {
final Builder builder = recoverBuilder(mContext, mN.publicVersion);
return builder.createContentView();
return ambient ? builder.makeAmbientNotification() : builder.createContentView();
}
Bundle savedBundle = mN.extras;
Style style = mStyle;
@@ -4221,14 +4234,15 @@ public class Notification implements Parcelable
publicExtras.putBoolean(EXTRA_CHRONOMETER_COUNT_DOWN,
savedBundle.getBoolean(EXTRA_CHRONOMETER_COUNT_DOWN));
publicExtras.putCharSequence(EXTRA_TITLE,
mContext.getString(R.string.notification_hidden_text));
mContext.getString(com.android.internal.R.string.notification_hidden_text));
mN.extras = publicExtras;
final RemoteViews publicView = applyStandardTemplate(getBaseLayoutResource());
final RemoteViews view = ambient ? makeAmbientNotification()
: applyStandardTemplate(getBaseLayoutResource());
mN.extras = savedBundle;
mN.mLargeIcon = largeIcon;
mN.largeIcon = largeIconLegacy;
mStyle = style;
return publicView;
return view;
}
/**