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

Commit c3b4516f authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '670-s-navbar' into 'v1-s' 

SystemUI: Update navbar icon color for light mode

See merge request e/os/android_frameworks_base!132
parents 48947d7b 06670275

packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java

+17 −4
Original line number Original line Diff line number Diff line
@@ -81,7 +81,8 @@ public class LightBarController implements BatteryController.BatteryStateChangeC 
     */

     */

    private boolean mForceDarkForScrim;

    private boolean mForceDarkForScrim;





    private boolean mQsCustomizing;

    private boolean mQsCustomizing = false;

    private boolean mQsExpanded = false;





    private boolean mDirectReplying;

    private boolean mDirectReplying;

    private boolean mNavbarColorManagedByIme;

    private boolean mNavbarColorManagedByIme;
@@ -143,9 +144,9 @@ public class LightBarController implements BatteryController.BatteryStateChangeC 
            mHasLightNavigationBar = isLight(appearance, navigationBarMode,

            mHasLightNavigationBar = isLight(appearance, navigationBarMode,

                    APPEARANCE_LIGHT_NAVIGATION_BARS);

                    APPEARANCE_LIGHT_NAVIGATION_BARS);

            mNavigationLight = mHasLightNavigationBar

            mNavigationLight = mHasLightNavigationBar

                    && (mDirectReplying && mNavbarColorManagedByIme || !mForceDarkForScrim)

                    && (mDirectReplying && mNavbarColorManagedByIme || !mForceDarkForScrim);

                    && !mQsCustomizing;

            if (mNavigationLight != last) {

            if (mNavigationLight != last) {

                mQsExpanded = false;

                updateNavigation();

                updateNavigation();

            }

            }

        }

        }
@@ -168,7 +169,19 @@ public class LightBarController implements BatteryController.BatteryStateChangeC 
    public void setQsCustomizing(boolean customizing) {

    public void setQsCustomizing(boolean customizing) {

        if (mQsCustomizing == customizing) return;

        if (mQsCustomizing == customizing) return;

        mQsCustomizing = customizing;

        mQsCustomizing = customizing;

        reevaluate();

        if (mQsCustomizing) {

            setQsExpanded(true);

        }

    }



    public void setQsExpanded(boolean expanded) {

        if (mQsExpanded == expanded) return;

        mQsExpanded = expanded;



        if (mNavigationBarController != null

                && mNavigationBarController.supportsIconTintForNavMode(mNavigationMode)) {

            mNavigationBarController.setIconsDark(mQsExpanded, animateChange());

        }

    }

    }





    /**

    /**

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+16 −0
Original line number Original line Diff line number Diff line
@@ -175,6 +175,7 @@ import com.android.systemui.statusbar.notification.stack.MediaHeaderView; 
import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.notification.stack.StackStateAnimator;

import com.android.systemui.statusbar.notification.stack.StackStateAnimator;

import com.android.systemui.statusbar.phone.LightBarController;

import com.android.systemui.statusbar.phone.LockscreenGestureLogger.LockscreenUiEvent;

import com.android.systemui.statusbar.phone.LockscreenGestureLogger.LockscreenUiEvent;

import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;

import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment;

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment;
@@ -296,6 +297,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    private final PulseExpansionHandler mPulseExpansionHandler;

    private final PulseExpansionHandler mPulseExpansionHandler;

    private final KeyguardBypassController mKeyguardBypassController;

    private final KeyguardBypassController mKeyguardBypassController;

    private final KeyguardUpdateMonitor mUpdateMonitor;

    private final KeyguardUpdateMonitor mUpdateMonitor;

    private final LightBarController mLightBarController;

    private final ConversationNotificationManager mConversationNotificationManager;

    private final ConversationNotificationManager mConversationNotificationManager;

    private final AuthController mAuthController;

    private final AuthController mAuthController;

    private final MediaHierarchyManager mMediaHierarchyManager;

    private final MediaHierarchyManager mMediaHierarchyManager;
@@ -834,6 +836,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                return true;

                return true;

            }

            }

        });

        });

        mLightBarController = Dependency.get(LightBarController.class);

        mLockscreenUserManager = notificationLockscreenUserManager;

        mLockscreenUserManager = notificationLockscreenUserManager;

        mEntryManager = notificationEntryManager;

        mEntryManager = notificationEntryManager;

        mConversationNotificationManager = conversationNotificationManager;

        mConversationNotificationManager = conversationNotificationManager;
@@ -2942,6 +2945,15 @@ public class NotificationPanelViewController extends PanelViewController { 
        }

        }

    }

    }





    private void updateNavColors(boolean expanded) {

        mLightBarController.setQsExpanded(expanded && !isNightMode());

    }



    private boolean isNightMode() {

        return (mView.getContext().getResources().getConfiguration().uiMode

                & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;

    }



    private int calculatePanelHeightShade() {

    private int calculatePanelHeightShade() {

        int emptyBottomMargin = mNotificationStackScrollLayoutController.getEmptyBottomMargin();

        int emptyBottomMargin = mNotificationStackScrollLayoutController.getEmptyBottomMargin();

        int maxHeight = mNotificationStackScrollLayoutController.getHeight() - emptyBottomMargin;

        int maxHeight = mNotificationStackScrollLayoutController.getHeight() - emptyBottomMargin;
@@ -4805,6 +4817,9 @@ public class NotificationPanelViewController extends PanelViewController { 
        if (state == STATE_OPEN && mCurrentPanelState != state) {

        if (state == STATE_OPEN && mCurrentPanelState != state) {

            mView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);

            mView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);

        }

        }

        if ((state == STATE_OPEN && mCurrentPanelState != state) || state == STATE_OPENING) {

            updateNavColors(true);

        }

        if (state == STATE_OPENING) {

        if (state == STATE_OPENING) {

            mStatusBar.makeExpandedVisible(false);

            mStatusBar.makeExpandedVisible(false);

        }

        }
@@ -4812,6 +4827,7 @@ public class NotificationPanelViewController extends PanelViewController { 
            // Close the status bar in the next frame so we can show the end of the

            // Close the status bar in the next frame so we can show the end of the

            // animation.

            // animation.

            mView.post(mMaybeHideExpandedRunnable);

            mView.post(mMaybeHideExpandedRunnable);

            updateNavColors(false);

        }

        }

        mCurrentPanelState = state;

        mCurrentPanelState = state;

    }

    }