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

Merge "Fixed several bugs with redaction." into lmp-preview-dev

Browse Source
This commit is contained in:
Selim Cinek
2014-06-10 17:33:44 +00:00
committed by Android (Google) Code Review
parent 429b1ab5cb 2f0df8ae03
commit 554f5406f3
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -209,7 +209,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
}
public int getMaxExpandHeight() {
return mMaxExpandHeight;
return mShowingPublic ? mRowMinHeight : mMaxExpandHeight;
}
/**
@@ -221,30 +221,35 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
@Override
public boolean isContentExpandable() {
return mPrivateLayout.isContentExpandable();
NotificationContentView showingLayout = getShowingLayout();
return showingLayout.isContentExpandable();
}
@Override
public void setActualHeight(int height, boolean notifyListeners) {
mPrivateLayout.setActualHeight(height);
mPublicLayout.setActualHeight(height);
invalidate();
super.setActualHeight(height, notifyListeners);
}
@Override
public int getMaxHeight() {
return mPrivateLayout.getMaxHeight();
NotificationContentView showingLayout = getShowingLayout();
return showingLayout.getMaxHeight();
}
@Override
public int getMinHeight() {
return mPrivateLayout.getMinHeight();
NotificationContentView showingLayout = getShowingLayout();
return showingLayout.getMinHeight();
}
@Override
public void setClipTopAmount(int clipTopAmount) {
super.setClipTopAmount(clipTopAmount);
mPrivateLayout.setClipTopAmount(clipTopAmount);
mPublicLayout.setClipTopAmount(clipTopAmount);
}
public boolean isBelowSpeedBump() {
@@ -256,11 +261,16 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
}
public void notifyContentUpdated() {
mPublicLayout.notifyContentUpdated();
mPrivateLayout.notifyContentUpdated();
}
public boolean isShowingLayoutLayouted() {
View showingLayout = mShowingPublic ? mPublicLayout : mPrivateLayout;
NotificationContentView showingLayout = getShowingLayout();
return showingLayout.getWidth() != 0;
}
private NotificationContentView getShowingLayout() {
return mShowingPublic ? mPublicLayout : mPrivateLayout;
}
}

4
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
View File

@@ -106,7 +106,7 @@ public class NotificationContentView extends FrameLayout {
private void selectLayout() {
if (mActualHeight <= mSmallHeight || mExpandedChild == null) {
if (mContractedChild.getVisibility() != View.VISIBLE) {
if (mContractedChild != null && mContractedChild.getVisibility() != View.VISIBLE) {
mContractedChild.setVisibility(View.VISIBLE);
}
if (mExpandedChild != null && mExpandedChild.getVisibility() != View.INVISIBLE) {
@@ -116,7 +116,7 @@ public class NotificationContentView extends FrameLayout {
if (mExpandedChild.getVisibility() != View.VISIBLE) {
mExpandedChild.setVisibility(View.VISIBLE);
}
if (mContractedChild.getVisibility() != View.INVISIBLE) {
if (mContractedChild != null && mContractedChild.getVisibility() != View.INVISIBLE) {
mContractedChild.setVisibility(View.INVISIBLE);
}
}