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

Commit f9477cc4 authored by Steve Elliott's avatar Steve Elliott
Browse files

Fix position of gentle notif header after dismiss peoplehub 

Fixes: 146150519
Test: manual, atest
Change-Id: I06887699ee126f14c43da09609b58337e3853392
parent 963c5ac7

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.java

+6 −7
Original line number Original line Diff line number Diff line
@@ -249,10 +249,8 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section 
            }

            }

        }

        }





        if (adjustPeopleHubVisibilityAndPosition(lastPersonIndex)) {

        // make room for peopleHub

        // make room for peopleHub

            firstGentleNotifIndex++;

        firstGentleNotifIndex += adjustPeopleHubVisibilityAndPosition(lastPersonIndex);

        }





        adjustGentleHeaderVisibilityAndPosition(firstGentleNotifIndex);

        adjustGentleHeaderVisibilityAndPosition(firstGentleNotifIndex);
@@ -296,7 +294,7 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section 
        }

        }

    }

    }





    private boolean adjustPeopleHubVisibilityAndPosition(int lastPersonIndex) {

    private int adjustPeopleHubVisibilityAndPosition(int lastPersonIndex) {

        final boolean showPeopleHeader = mPeopleHubVisible

        final boolean showPeopleHeader = mPeopleHubVisible

                && mNumberOfSections > 2

                && mNumberOfSections > 2

                && mStatusBarStateController.getState() != StatusBarState.KEYGUARD;

                && mStatusBarStateController.getState() != StatusBarState.KEYGUARD;
@@ -307,6 +305,7 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section 
        if (!showPeopleHeader) {

        if (!showPeopleHeader) {

            if (currentlyVisible) {

            if (currentlyVisible) {

                mParent.removeView(mPeopleHubView);

                mParent.removeView(mPeopleHubView);

                return -1;

            }

            }

        } else {

        } else {

            mPeopleHubView.unDismiss();

            mPeopleHubView.unDismiss();
@@ -317,7 +316,7 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section 
                    mPeopleHubView.setTransientContainer(null);

                    mPeopleHubView.setTransientContainer(null);

                }

                }

                mParent.addView(mPeopleHubView, targetIndex);

                mParent.addView(mPeopleHubView, targetIndex);

                return true;

                return 1;

            } else if (currentHubIndex != targetIndex) {

            } else if (currentHubIndex != targetIndex) {

                if (currentHubIndex < targetIndex) {

                if (currentHubIndex < targetIndex) {

                    targetIndex--;

                    targetIndex--;
@@ -325,7 +324,7 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section 
                mParent.changeViewPosition(mPeopleHubView, targetIndex);

                mParent.changeViewPosition(mPeopleHubView, targetIndex);

            }

            }

        }

        }

        return false;

        return 0;

    }

    }





    /**

    /**