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

Merge "Cleaned up the logic for the picture end margin" into nyc-dev

Browse Source
This commit is contained in:
Selim Cinek
2016-02-19 23:04:25 +00:00
committed by Android (Google) Code Review
parent 24ffe236b1 247fa01931
commit 54c857cda6
4 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -895,6 +895,11 @@ public class Notification implements Parcelable
*/
public static final String EXTRA_BUILDER_APPLICATION_INFO = "android.appInfo";
/**
* @hide
*/
public static final String EXTRA_CONTAINS_CUSTOM_VIEW = "android.contains.customView";
private Icon mSmallIcon;
private Icon mLargeIcon;
@@ -3425,6 +3430,10 @@ public class Notification implements Parcelable
mN.extras.putStringArray(EXTRA_PEOPLE,
mPersonList.toArray(new String[mPersonList.size()]));
}
if (mN.bigContentView != null || mN.contentView != null
|| mN.headsUpContentView != null) {
mN.extras.putBoolean(EXTRA_CONTAINS_CUSTOM_VIEW, true);
}
return mN;
}
@@ -4137,6 +4146,7 @@ public class Notification implements Parcelable
final float density = mBuilder.mContext.getResources().getDisplayMetrics().density;
int topPadding = (int) (5 * density);
int bottomPadding = (int) (13 * density);
boolean first = true;
while (i < mTexts.size() && i < rowIds.length) {
CharSequence str = mTexts.get(i);
if (str != null && !str.equals("")) {
@@ -4148,23 +4158,26 @@ public class Notification implements Parcelable
}
contentView.setViewPadding(rowIds[i], 0, topPadding, 0,
i == rowIds.length - 1 || i == mTexts.size() - 1 ? bottomPadding : 0);
handleInboxImageMargin(contentView, rowIds[i], first);
first = false;
}
i++;
}
handleInboxImageMargin(contentView, rowIds[0]);
return contentView;
}
private void handleInboxImageMargin(RemoteViews contentView, int id) {
final int max = mBuilder.mN.extras.getInt(EXTRA_PROGRESS_MAX, 0);
final boolean ind = mBuilder.mN.extras.getBoolean(EXTRA_PROGRESS_INDETERMINATE);
boolean hasProgress = max != 0 || ind;
private void handleInboxImageMargin(RemoteViews contentView, int id, boolean first) {
int endMargin = 0;
if (mTexts.size() > 0 && mBuilder.mN.mLargeIcon != null && !hasProgress) {
endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
R.dimen.notification_content_picture_margin);
if (first) {
final int max = mBuilder.mN.extras.getInt(EXTRA_PROGRESS_MAX, 0);
final boolean ind = mBuilder.mN.extras.getBoolean(EXTRA_PROGRESS_INDETERMINATE);
boolean hasProgress = max != 0 || ind;
if (mBuilder.mN.mLargeIcon != null && !hasProgress) {
endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
R.dimen.notification_content_picture_margin);
}
}
contentView.setViewLayoutMarginEnd(id, endMargin);
}
@@ -4347,13 +4360,11 @@ public class Notification implements Parcelable
}
handleImage(view);
// handle the content margin
int endMargin;
int endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
R.dimen.notification_content_margin_end);;
if (mBuilder.mN.mLargeIcon != null) {
endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
R.dimen.notification_content_picture_margin_media);
} else {
endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
R.dimen.notification_content_margin_end);
endMargin += mBuilder.mContext.getResources().getDimensionPixelSize(
R.dimen.notification_content_picture_margin);
}
view.setViewLayoutMarginEnd(R.id.notification_main_column, endMargin);
return view;
@@ -4463,9 +4474,6 @@ public class Notification implements Parcelable
return makeDecoratedHeadsUpContentView();
}
/**
* @hide
*/
private RemoteViews makeDecoratedHeadsUpContentView() {
RemoteViews headsUpContentView = mBuilder.mN.headsUpContentView == null
? mBuilder.mN.contentView
@@ -4475,25 +4483,17 @@ public class Notification implements Parcelable
}
RemoteViews remoteViews = mBuilder.applyStandardTemplateWithActions(
mBuilder.getBigBaseLayoutResource());
remoteViews.removeAllViews(R.id.notification_main_column);
remoteViews.addView(R.id.notification_main_column, headsUpContentView);
buildIntoRemoteViewContent(remoteViews, headsUpContentView);
return remoteViews;
}
/**
* @hide
*/
private RemoteViews makeStandardTemplateWithCustomContent(RemoteViews customContent) {
RemoteViews remoteViews = mBuilder.applyStandardTemplate(
mBuilder.getBaseLayoutResource());
remoteViews.removeAllViews(R.id.notification_main_column);
remoteViews.addView(R.id.notification_main_column, customContent);
buildIntoRemoteViewContent(remoteViews, customContent);
return remoteViews;
}
/**
* @hide
*/
private RemoteViews makeDecoratedBigContentView() {
RemoteViews bigContentView = mBuilder.mN.bigContentView == null
? mBuilder.mN.contentView
@@ -4503,10 +4503,23 @@ public class Notification implements Parcelable
}
RemoteViews remoteViews = mBuilder.applyStandardTemplateWithActions(
mBuilder.getBigBaseLayoutResource());
remoteViews.removeAllViews(R.id.notification_main_column);
remoteViews.addView(R.id.notification_main_column, bigContentView);
buildIntoRemoteViewContent(remoteViews, bigContentView);
return remoteViews;
}
private void buildIntoRemoteViewContent(RemoteViews remoteViews,
RemoteViews customContent) {
remoteViews.removeAllViews(R.id.notification_main_column);
remoteViews.addView(R.id.notification_main_column, customContent);
// also update the end margin if there is an image
int endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
R.dimen.notification_content_margin_end);
if (mBuilder.mN.mLargeIcon != null) {
endMargin += mBuilder.mContext.getResources().getDimensionPixelSize(
R.dimen.notification_content_picture_margin);
}
remoteViews.setViewLayoutMarginEnd(R.id.notification_main_column, endMargin);
}
}
// When adding a new Style subclass here, don't forget to update

3
core/res/res/values/dimens.xml
View File

@@ -150,9 +150,6 @@
<!-- The margin on the end of the content view with a picture.-->
<dimen name="notification_content_picture_margin">56dp</dimen>
<!-- The margin on the end of the content view with a picture in the compact media.-->
<dimen name="notification_content_picture_margin_media">72dp</dimen>
<!-- height of the content margin to accomodate for the header -->
<dimen name="notification_content_margin_top">30dp</dimen>

1
core/res/res/values/symbols.xml
View File

@@ -2512,7 +2512,6 @@
<java-symbol type="dimen" name="media_notification_expanded_image_max_size" />
<java-symbol type="dimen" name="media_notification_expanded_image_margin_bottom" />
<java-symbol type="dimen" name="notification_content_image_margin_end" />
<java-symbol type="dimen" name="notification_content_picture_margin_media" />
<java-symbol type="bool" name="config_strongAuthRequiredOnBoot" />

9
packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
View File

@@ -34,6 +34,7 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Objects;
/**
* The list of currently displaying notifications.
@@ -118,10 +119,16 @@ public class NotificationData {
final RemoteViews newPublicNotification
= updatedNotificationBuilder.makePublicContentView();
boolean sameCustomView = Objects.equals(
notification.getNotification().extras.getBoolean(
Notification.EXTRA_CONTAINS_CUSTOM_VIEW),
updatedNotification.extras.getBoolean(
Notification.EXTRA_CONTAINS_CUSTOM_VIEW));
applyInPlace = compareRemoteViews(cachedContentView, newContentView)
&& compareRemoteViews(cachedBigContentView, newBigContentView)
&& compareRemoteViews(cachedHeadsUpContentView, newHeadsUpContentView)
&& compareRemoteViews(cachedPublicContentView, newPublicNotification);
&& compareRemoteViews(cachedPublicContentView, newPublicNotification)
&& sameCustomView;
cachedPublicContentView = newPublicNotification;
cachedHeadsUpContentView = newHeadsUpContentView;
cachedBigContentView = newBigContentView;