Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a5e4a3 authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am 2761ccd4: Merge "Retain expanded state across more than one violent update." into jb-dev 

* commit '2761ccd4':
  Retain expanded state across more than one violent update.
parents 51f755ab 2761ccd4

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+1 −0
Original line number Diff line number Diff line
@@ -913,6 +913,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
            if (wasExpanded) {

                final NotificationData.Entry newEntry = mNotificationData.findByKey(key);

                expandView(newEntry, true);

                newEntry.setUserExpanded(true);

            }

        }

packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java

+6 −0
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ public class NotificationData { 
        public boolean userExpanded() {

            return NotificationData.getUserExpanded(row);

        }

        /**

         * Set the flag indicating that this was manually expanded by the user.

         */

        public boolean setUserExpanded(boolean userExpanded) {

            return NotificationData.setUserExpanded(row, userExpanded);

        }

    }

    private final ArrayList<Entry> mEntries = new ArrayList<Entry>();

    private final Comparator<Entry> mEntryCmp = new Comparator<Entry>() {