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

This commit is contained in:
Vinit Nayak
2022-10-14 17:57:23 +00:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 2 deletions

View File

@@ -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.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
import static android.view.Display.DEFAULT_DISPLAY; 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 static com.android.systemui.shared.recents.utilities.Utilities.isTablet;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -141,7 +142,13 @@ public class NavigationBarController implements
public void onConfigChanged(Configuration newConfig) { public void onConfigChanged(Configuration newConfig) {
boolean isOldConfigTablet = mIsTablet; boolean isOldConfigTablet = mIsTablet;
mIsTablet = isTablet(mContext); mIsTablet = isTablet(mContext);
boolean willApplyConfig = mConfigChanges.applyNewConfig(mContext.getResources());
boolean largeScreenChanged = mIsTablet != isOldConfigTablet; 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()) { if (mTaskbarDelegate.isInitialized()) {
mTaskbarDelegate.onConfigurationChanged(newConfig); mTaskbarDelegate.onConfigurationChanged(newConfig);
} }
@@ -150,7 +157,7 @@ public class NavigationBarController implements
return; return;
} }
if (mConfigChanges.applyNewConfig(mContext.getResources())) { if (willApplyConfig) {
for (int i = 0; i < mNavigationBars.size(); i++) { for (int i = 0; i < mNavigationBars.size(); i++) {
recreateNavigationBar(mNavigationBars.keyAt(i)); recreateNavigationBar(mNavigationBars.keyAt(i));
} }

View File

@@ -113,7 +113,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
private static final int MAX_NUM_LOGGED_GESTURES = 10; private static final int MAX_NUM_LOGGED_GESTURES = 10;
static final boolean DEBUG_MISSING_GESTURE = false; 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 = private ISystemGestureExclusionListener mGestureExclusionListener =
new ISystemGestureExclusionListener.Stub() { new ISystemGestureExclusionListener.Stub() {