diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-29 21:23:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-29 21:23:03 +0000 |
| commit | 9f5957989ef8d1e2219b624d731acfbf61a366d2 (patch) | |
| tree | eda8a88fe6bf64fca99094fd76357dc61c70c973 /packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | |
| parent | b3988743af7828a0794bfb562b7f6695cf418d7a (diff) | |
| parent | dce3c4cca5d4df4cc49c1a9f0537e2fecdbc45d2 (diff) | |
| download | frameworks_base-9f5957989ef8d1e2219b624d731acfbf61a366d2.zip frameworks_base-9f5957989ef8d1e2219b624d731acfbf61a366d2.tar.gz frameworks_base-9f5957989ef8d1e2219b624d731acfbf61a366d2.tar.bz2 | |
Merge "Prevent expanded notifications on lockscreen."
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 90b63f4..4e3a900 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -71,7 +71,6 @@ import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.statusbar.StatusBarIconList; import com.android.internal.util.LegacyNotificationUtil; -import com.android.internal.widget.SizeAdaptiveLayout; import com.android.systemui.R; import com.android.systemui.RecentsComponent; import com.android.systemui.SearchPanelView; @@ -1061,11 +1060,12 @@ public abstract class BaseStatusBar extends SystemUI implements for (int i = n-1; i >= 0; i--) { NotificationData.Entry entry = mNotificationData.get(i); if (mOnKeyguard) { - entry.row.setSystemExpanded(false); + entry.row.setExpansionDisabled(true); } else { + entry.row.setExpansionDisabled(false); if (!entry.row.isUserLocked()) { boolean top = (i == n-1); - entry.row.setSystemExpanded(top || entry.row.isUserExpanded()); + entry.row.setSystemExpanded(top); } } entry.row.setDimmed(mOnKeyguard); @@ -1278,8 +1278,8 @@ public abstract class BaseStatusBar extends SystemUI implements final boolean userChangedExpansion = oldEntry.row.hasUserChangedExpansion(); if (userChangedExpansion) { boolean userExpanded = oldEntry.row.isUserExpanded(); - newEntry.row.applyExpansionToLayout(userExpanded); newEntry.row.setUserExpanded(userExpanded); + newEntry.row.applyExpansionToLayout(); } } |