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

Commit efe99f7c authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Add debug logs for navBarController config change" into tm-qpr-dev am:... 

Merge "Add debug logs for navBarController config change" into tm-qpr-dev am: ba9ee95a am: 249e40cb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20192135



Change-Id: I3271ab62fe8e229b4da5be5fc1f8f10b4a03d317
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79420036 249e40cb

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+8 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE 
import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;

import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler.DEBUG_MISSING_GESTURE_TAG;

import static com.android.systemui.shared.recents.utilities.Utilities.isTablet;



import android.content.ContentResolver;
@@ -141,7 +142,13 @@ public class NavigationBarController implements 
    public void onConfigChanged(Configuration newConfig) {

        boolean isOldConfigTablet = mIsTablet;

        mIsTablet = isTablet(mContext);

        boolean willApplyConfig = mConfigChanges.applyNewConfig(mContext.getResources());

        boolean largeScreenChanged = mIsTablet != isOldConfigTablet;

        // TODO(b/243765256): Disable this logging once b/243765256 is fixed.

        Log.d(DEBUG_MISSING_GESTURE_TAG, "NavbarController: newConfig=" + newConfig

                + " mTaskbarDelegate initialized=" + mTaskbarDelegate.isInitialized()

                + " willApplyConfigToNavbars=" + willApplyConfig

                + " navBarCount=" + mNavigationBars.size());

        if (mTaskbarDelegate.isInitialized()) {

            mTaskbarDelegate.onConfigurationChanged(newConfig);

        }
@@ -150,7 +157,7 @@ public class NavigationBarController implements 
            return;

        }



        if (mConfigChanges.applyNewConfig(mContext.getResources())) {

        if (willApplyConfig) {

            for (int i = 0; i < mNavigationBars.size(); i++) {

                recreateNavigationBar(mNavigationBars.keyAt(i));

            }

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
    private static final int MAX_NUM_LOGGED_GESTURES = 10;



    static final boolean DEBUG_MISSING_GESTURE = false;

    static final String DEBUG_MISSING_GESTURE_TAG = "NoBackGesture";

    public static final String DEBUG_MISSING_GESTURE_TAG = "NoBackGesture";



    private ISystemGestureExclusionListener mGestureExclusionListener =

            new ISystemGestureExclusionListener.Stub() {