summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/inputmethodservice/InputMethodService.java15
-rw-r--r--core/java/android/inputmethodservice/NavigationBarController.java11
-rw-r--r--core/java/android/view/InsetsController.java2
-rw-r--r--core/java/android/view/InsetsSource.java13
-rw-r--r--core/java/android/view/InsetsState.java4
-rw-r--r--core/java/android/view/ViewTreeObserver.java9
-rw-r--r--core/java/com/android/internal/policy/DecorView.java1
7 files changed, 0 insertions, 55 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 7967db604d1e..f1ae9be8528d 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -685,12 +685,7 @@ public class InputMethodService extends AbstractInputMethodService {
private ImeTracker.Token mCurStatsToken;
final ViewTreeObserver.OnComputeInternalInsetsListener mInsetsComputer = info -> {
- Log.i("b/297000797", "IME#OnComputeInternalInsetsListener, start info: " + info
- + " before onComputeInsets, tmpInsets: " + mTmpInsets,
- new Throwable());
onComputeInsets(mTmpInsets);
- Log.i("b/297000797", "IME#OnComputeInternalInsetsListener,"
- + " after onComputeInsets, tmpInsets: " + mTmpInsets);
if (!mViewsCreated) {
// The IME views are not ready, keep visible insets untouched.
mTmpInsets.visibleTopInsets = 0;
@@ -710,7 +705,6 @@ public class InputMethodService extends AbstractInputMethodService {
}
mNavigationBarController.updateTouchableInsets(mTmpInsets, info);
- Log.i("b/297000797", "IME#OnComputeInternalInsetsListener, end info: " + info);
if (mInputFrame != null) {
setImeExclusionRect(mTmpInsets.visibleTopInsets);
}
@@ -1469,15 +1463,6 @@ public class InputMethodService extends AbstractInputMethodService {
proto.write(TOUCHABLE_REGION, touchableRegion.toString());
proto.end(token);
}
-
- @Override
- public String toString() {
- return "Insets{contentTopInsets=" + contentTopInsets
- + " visibleTopInsets=" + visibleTopInsets
- + " touchableInsets=" + touchableInsets
- + " touchableRegion=" + touchableRegion.getBounds()
- + "}";
- }
}
/**
diff --git a/core/java/android/inputmethodservice/NavigationBarController.java b/core/java/android/inputmethodservice/NavigationBarController.java
index 22792a5ebcd6..8be4c5858694 100644
--- a/core/java/android/inputmethodservice/NavigationBarController.java
+++ b/core/java/android/inputmethodservice/NavigationBarController.java
@@ -31,7 +31,6 @@ import android.graphics.Rect;
import android.graphics.Region;
import android.inputmethodservice.navigationbar.NavigationBarFrame;
import android.inputmethodservice.navigationbar.NavigationBarView;
-import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -115,8 +114,6 @@ final class NavigationBarController {
}
void onNavButtonFlagsChanged(@InputMethodNavButtonFlags int navButtonFlags) {
- Log.i("b/297000797", "NavigationBarController#onNavButtonFlagsChanged: " + navButtonFlags,
- new Throwable());
mImpl.onNavButtonFlagsChanged(navButtonFlags);
}
@@ -238,10 +235,6 @@ final class NavigationBarController {
if (ENABLE_HIDE_IME_CAPTION_BAR) {
mNavigationBarFrame.setOnApplyWindowInsetsListener((view, insets) -> {
- Log.i("b/297000797", "NavigationBarController#onApplyWindowInsetsListener:"
- + " mNavigationBarFrame: " + mNavigationBarFrame
- + " captionBar visible: " + insets.isVisible(captionBar())
- + " insets: " + insets);
if (mNavigationBarFrame != null) {
boolean visible = insets.isVisible(captionBar());
mNavigationBarFrame.setVisibility(visible ? View.VISIBLE : View.GONE);
@@ -460,10 +453,6 @@ final class NavigationBarController {
mShouldShowImeSwitcherWhenImeIsShown = shouldShowImeSwitcherWhenImeIsShown;
if (ENABLE_HIDE_IME_CAPTION_BAR) {
- Log.i("b/297000797", "NavigationBarController#onNavButtonFlagsChanged,"
- + " calling setImeCaptionBarInsetsHeight"
- + " with: " + getImeCaptionBarHeight(),
- new Throwable());
mService.mWindow.getWindow().getDecorView().getWindowInsetsController()
.setImeCaptionBarInsetsHeight(getImeCaptionBarHeight());
}
diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java
index 9186e4939b78..fb24211e591a 100644
--- a/core/java/android/view/InsetsController.java
+++ b/core/java/android/view/InsetsController.java
@@ -1856,8 +1856,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
return;
}
Rect newFrame = new Rect(mFrame.left, mFrame.bottom - height, mFrame.right, mFrame.bottom);
- Log.i("b/297000797", "InsetsController#setImeCaptionBarInsetsHeight,"
- + " height: " + height + " frame: " + mFrame);
InsetsSource source = mState.peekSource(ID_IME_CAPTION_BAR);
if (mImeCaptionBarInsetsHeight != height
|| (source != null && !newFrame.equals(source.getFrame()))) {
diff --git a/core/java/android/view/InsetsSource.java b/core/java/android/view/InsetsSource.java
index 3e435ae0a40a..0d5704eed4b3 100644
--- a/core/java/android/view/InsetsSource.java
+++ b/core/java/android/view/InsetsSource.java
@@ -31,7 +31,6 @@ import android.graphics.Insets;
import android.graphics.Rect;
import android.os.Parcel;
import android.os.Parcelable;
-import android.util.Log;
import android.util.proto.ProtoOutputStream;
import android.view.WindowInsets.Type.InsetsType;
@@ -197,12 +196,6 @@ public class InsetsSource implements Parcelable {
* source.
*/
public Insets calculateInsets(Rect relativeFrame, boolean ignoreVisibility) {
- if (getType() == WindowInsets.Type.ime()) {
- Log.i("b/297000797", "InsetsSource#calculateInsets tmpFrame: " + mTmpFrame
- + " ignoreVisibility: " + ignoreVisibility
- + " frame: " + mFrame
- + " relativeFrame: " + relativeFrame, new Throwable());
- }
return calculateInsets(relativeFrame, mFrame, ignoreVisibility);
}
@@ -210,12 +203,6 @@ public class InsetsSource implements Parcelable {
* Like {@link #calculateInsets(Rect, boolean)}, but will return visible insets.
*/
public Insets calculateVisibleInsets(Rect relativeFrame) {
- if (getType() == WindowInsets.Type.ime()) {
- Log.i("b/297000797", "InsetsSource#calculateVisibleInsets tmpFrame: " + mTmpFrame
- + " frame: " + mFrame
- + " visibleFrame: " + mVisibleFrame
- + " relativeFrame: " + relativeFrame, new Throwable());
- }
return calculateInsets(relativeFrame, mVisibleFrame != null ? mVisibleFrame : mFrame,
false /* ignoreVisibility */);
}
diff --git a/core/java/android/view/InsetsState.java b/core/java/android/view/InsetsState.java
index eac74081bf85..59e0932ecd80 100644
--- a/core/java/android/view/InsetsState.java
+++ b/core/java/android/view/InsetsState.java
@@ -45,7 +45,6 @@ import android.graphics.Insets;
import android.graphics.Rect;
import android.os.Parcel;
import android.os.Parcelable;
-import android.util.Log;
import android.util.SparseArray;
import android.util.SparseIntArray;
import android.util.proto.ProtoOutputStream;
@@ -381,9 +380,6 @@ public class InsetsState implements Parcelable {
@InternalInsetsSide @Nullable SparseIntArray idSideMap,
@Nullable boolean[] typeVisibilityMap, Insets insets, int type) {
int index = indexOf(type);
- if (source.getId() == InsetsSource.ID_IME) {
- Log.i("b/297000797", "InsetsState#processSourceAsPublicType, ime insets: " + insets);
- }
// Don't put Insets.NONE into typeInsetsMap. Otherwise, two WindowInsets can be considered
// as non-equal while they provide the same insets of each type from WindowInsets#getInsets
diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java
index 9e8ca20ac42f..c9526fde27df 100644
--- a/core/java/android/view/ViewTreeObserver.java
+++ b/core/java/android/view/ViewTreeObserver.java
@@ -315,15 +315,6 @@ public final class ViewTreeObserver {
}
@Override
- public String toString() {
- return "InternalInsetsInfo{contentInsets=" + contentInsets
- + " visibleInsets=" + visibleInsets
- + " touchableRegion=" + touchableRegion.getBounds()
- + "}";
-
- }
-
- @Override
public int hashCode() {
int result = contentInsets.hashCode();
result = 31 * result + visibleInsets.hashCode();
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index 9d661746b12a..3e16df4d7f67 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -1123,7 +1123,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
final Insets systemInsets = clearsCompatInsets
? Insets.NONE
: Insets.min(insets.getInsets(compatInsetsTypes), stableBarInsets);
- Log.i("b/297000797", "DecorView#updateColorViews, systemInsets: " + systemInsets);
mLastTopInset = systemInsets.top;
mLastBottomInset = systemInsets.bottom;
mLastRightInset = systemInsets.right;