filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: We don't need to check for verbose logging everywhere

Browse Source 
We can just do this in the actual method

Change-Id: I80e89b0ab97926749851628b1bd34e8cd9dc82f2
This commit is contained in:
Michael W
2025-05-18 09:18:48 +00:00
parent 8613b6bcc8
commit c4bbba9441
39 changed files with 293 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/ui/AsyncImageView.java
+6 -8
View File
@@ -210,14 +210,12 @@ public class AsyncImageView extends AppCompatImageView implements
}
}
if (LogUtil.isLoggable(TAG, LogUtil.VERBOSE)) {
if (mImageResource instanceof GifImageResource) {
LogUtil.v(TAG, "setImage size unknown -- it's a GIF");
} else {
LogUtil.v(TAG, "setImage size: " + mImageResource.getMediaSize() +
" width: " + mImageResource.getBitmap().getWidth() +
" heigh: " + mImageResource.getBitmap().getHeight());
}
if (mImageResource instanceof GifImageResource) {
LogUtil.v(TAG, "setImage size unknown -- it's a GIF");
} else {
LogUtil.v(TAG, "setImage size: " + mImageResource.getMediaSize() +
" width: " + mImageResource.getBitmap().getWidth() +
" heigh: " + mImageResource.getBitmap().getHeight());
}
}
invalidate();
src/com/android/messaging/ui/BugleActionBarActivity.java
+10 -24
View File
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 The LineageOS Project
* Copyright (C) 2024-2025 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -69,9 +69,7 @@ public class BugleActionBarActivity extends AppCompatActivity implements ImeUtil
}
mLastScreenHeight = getResources().getDisplayMetrics().heightPixels;
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.VERBOSE)) {
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onCreate");
}
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onCreate");
getWindow().setStatusBarColor(getResources().getColor(R.color.action_bar_background_color,
getTheme()));
@@ -80,42 +78,32 @@ public class BugleActionBarActivity extends AppCompatActivity implements ImeUtil
@Override
protected void onStart() {
super.onStart();
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.VERBOSE)) {
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onStart");
}
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onStart");
}
@Override
protected void onRestart() {
super.onRestart();
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.VERBOSE)) {
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onRestart");
}
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onRestart");
}
@Override
protected void onResume() {
super.onResume();
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.VERBOSE)) {
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onResume");
}
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onResume");
BugleActivityUtil.onActivityResume(this, BugleActionBarActivity.this);
}
@Override
protected void onPause() {
super.onPause();
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.VERBOSE)) {
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onPause");
}
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onPause");
}
@Override
protected void onStop() {
super.onStop();
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.VERBOSE)) {
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onStop");
}
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onStop");
}
private boolean mDestroyed;
@@ -151,11 +139,9 @@ public class BugleActionBarActivity extends AppCompatActivity implements ImeUtil
final boolean imeWasOpen = mImeOpen;
mImeOpen = screenHeight - height > 100;
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.VERBOSE)) {
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onDisplayHeightChanged " +
"imeWasOpen: " + imeWasOpen + " mImeOpen: " + mImeOpen + " screenHeight: " +
screenHeight + " height: " + height);
}
LogUtil.v(LogUtil.BUGLE_TAG, this.getLocalClassName() + ".onDisplayHeightChanged " +
"imeWasOpen: " + imeWasOpen + " mImeOpen: " + mImeOpen + " screenHeight: " +
screenHeight + " height: " + height);
if (imeWasOpen != mImeOpen) {
for (final ImeUtil.ImeStateObserver observer : mImeStateObservers) {
src/com/android/messaging/ui/ImeDetectFrameLayout.java
+4 -5
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2025 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,11 +34,9 @@ public class ImeDetectFrameLayout extends FrameLayout {
final int measuredHeight = getMeasuredHeight();
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.VERBOSE)) {
LogUtil.v(LogUtil.BUGLE_TAG, "ImeDetectFrameLayout " +
"measuredHeight: " + measuredHeight + " getMeasuredHeight(): " +
getMeasuredHeight());
}
LogUtil.v(LogUtil.BUGLE_TAG, "ImeDetectFrameLayout " +
"measuredHeight: " + measuredHeight + " getMeasuredHeight(): " +
getMeasuredHeight());
if (measuredHeight != getMeasuredHeight() && getContext() instanceof ImeUtil.ImeStateHost) {
((ImeUtil.ImeStateHost) getContext()).onDisplayHeightChanged(heightMeasureSpec);
src/com/android/messaging/ui/conversation/ConversationFragment.java
+3 -5
View File
@@ -901,11 +901,9 @@ public class ConversationFragment extends Fragment implements ConversationDataLi
// Are we coming from a widget click where we're told to scroll to a particular item?
final int scrollToPos = getScrollToMessagePosition();
if (scrollToPos >= 0) {
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.VERBOSE)) {
LogUtil.v(LogUtil.BUGLE_TAG, "onConversationMessagesCursorUpdated " +
" scrollToPos: " + scrollToPos +
" cursorCount: " + cursor.getCount());
}
LogUtil.v(LogUtil.BUGLE_TAG, "onConversationMessagesCursorUpdated " +
" scrollToPos: " + scrollToPos +
" cursorCount: " + cursor.getCount());
scrollToPosition(scrollToPos, true /*smoothScroll*/);
clearScrollToMessagePosition();
}
src/com/android/messaging/ui/conversationlist/ConversationListFragment.java
+1 -4
View File
@@ -68,7 +68,6 @@ public class ConversationListFragment extends Fragment implements ConversationLi
ConversationListItemView.HostInterface {
private static final String BUNDLE_ARCHIVED_MODE = "archived_mode";
private static final String BUNDLE_FORWARD_MESSAGE_MODE = "forward_message_mode";
private static final boolean VERBOSE = false;
private MenuItem mShowBlockedMenuItem;
private boolean mArchiveMode;
@@ -241,9 +240,7 @@ public class ConversationListFragment extends Fragment implements ConversationLi
@Override
public void onAttach(@NonNull final Context context) {
super.onAttach(context);
if (VERBOSE) {
LogUtil.v(LogUtil.BUGLE_TAG, "Attaching List");
}
LogUtil.v(LogUtil.BUGLE_TAG, "Attaching List");
final Bundle arguments = getArguments();
if (arguments != null) {
mArchiveMode = arguments.getBoolean(BUNDLE_ARCHIVED_MODE, false);