diff options
Diffstat (limited to 'core/java/android/view')
-rwxr-xr-x | core/java/android/view/OrientationEventListener.java | 3 | ||||
-rw-r--r-- | core/java/android/view/SurfaceView.java | 3 | ||||
-rw-r--r-- | core/java/android/view/View.java | 2 | ||||
-rw-r--r-- | core/java/android/view/ViewDebug.java | 5 | ||||
-rw-r--r-- | core/java/android/view/ViewRoot.java | 9 | ||||
-rw-r--r-- | core/java/android/view/WindowManagerImpl.java | 3 | ||||
-rwxr-xr-x | core/java/android/view/WindowOrientationListener.java | 3 | ||||
-rw-r--r-- | core/java/android/view/accessibility/AccessibilityManager.java | 8 |
8 files changed, 14 insertions, 22 deletions
diff --git a/core/java/android/view/OrientationEventListener.java b/core/java/android/view/OrientationEventListener.java index 391ba1e..cd48a4f 100755 --- a/core/java/android/view/OrientationEventListener.java +++ b/core/java/android/view/OrientationEventListener.java @@ -21,7 +21,6 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; -import android.util.Config; import android.util.Log; /** @@ -31,7 +30,7 @@ import android.util.Log; public abstract class OrientationEventListener { private static final String TAG = "OrientationEventListener"; private static final boolean DEBUG = false; - private static final boolean localLOGV = DEBUG ? Config.LOGD : Config.LOGV; + private static final boolean localLOGV = false; private int mOrientation = ORIENTATION_UNKNOWN; private SensorManager mSensorManager; private boolean mEnabled = false; diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 87b3d79..0a7a375 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -34,7 +34,6 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.ParcelFileDescriptor; import android.util.AttributeSet; -import android.util.Config; import android.util.Log; import java.lang.ref.WeakReference; @@ -84,7 +83,7 @@ import java.util.concurrent.locks.ReentrantLock; public class SurfaceView extends View { static private final String TAG = "SurfaceView"; static private final boolean DEBUG = false; - static private final boolean localLOGV = DEBUG ? true : Config.LOGV; + static private final boolean localLOGV = DEBUG ? true : false; final ArrayList<SurfaceHolder.Callback> mCallbacks = new ArrayList<SurfaceHolder.Callback>(); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index e329e97..dc8e52f 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -4603,7 +4603,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility } //noinspection SimplifiableIfStatement,deprecation - if (android.util.Config.LOGV) { + if (false) { captureViewInfo("captureViewKeyEvent", this); } diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 89736d6..881cb76 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -16,7 +16,6 @@ package android.view; -import android.util.Config; import android.util.Log; import android.util.DisplayMetrics; import android.content.res.Resources; @@ -158,7 +157,7 @@ public class ViewDebug { /** * <p>Enables or disables views consistency check. Even when this property is enabled, - * view consistency checks happen only if {@link android.util.Config#DEBUG} is set + * view consistency checks happen only if {@link false} is set * to true. The value of this property can be configured externally in one of the * following files:</p> * <ul> @@ -172,7 +171,7 @@ public class ViewDebug { public static boolean consistencyCheckEnabled = false; static { - if (Config.DEBUG) { + if (false) { Debug.setFieldsOn(ViewDebug.class, true); } } diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index a899b46..1a6bae7 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -49,7 +49,6 @@ import android.os.ServiceManager; import android.os.SystemClock; import android.os.SystemProperties; import android.util.AndroidRuntimeException; -import android.util.Config; import android.util.DisplayMetrics; import android.util.EventLog; import android.util.Log; @@ -1273,7 +1272,7 @@ public final class ViewRoot extends Handler implements ViewParent, } host.layout(0, 0, host.getMeasuredWidth(), host.getMeasuredHeight()); - if (Config.DEBUG && ViewDebug.consistencyCheckEnabled) { + if (false && ViewDebug.consistencyCheckEnabled) { if (!host.dispatchConsistencyCheck(ViewDebug.CONSISTENCY_LAYOUT)) { throw new IllegalStateException("The view hierarchy is an inconsistent state," + "please refer to the logs with the tag " @@ -1711,7 +1710,7 @@ public final class ViewRoot extends Handler implements ViewParent, mAttachInfo.mIgnoreDirtyState = false; } - if (Config.DEBUG && ViewDebug.consistencyCheckEnabled) { + if (false && ViewDebug.consistencyCheckEnabled) { mView.dispatchConsistencyCheck(ViewDebug.CONSISTENCY_DRAWING); } @@ -2442,7 +2441,7 @@ public final class ViewRoot extends Handler implements ViewParent, if (isDown) { ensureTouchMode(true); } - if(Config.LOGV) { + if(false) { captureMotionLog("captureDispatchPointer", event); } @@ -2981,7 +2980,7 @@ public final class ViewRoot extends Handler implements ViewParent, return; } - if (Config.LOGV) { + if (false) { captureKeyLog("captureDispatchKeyEvent", event); } diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java index a4c4544..8336959 100644 --- a/core/java/android/view/WindowManagerImpl.java +++ b/core/java/android/view/WindowManagerImpl.java @@ -19,7 +19,6 @@ package android.view; import android.graphics.PixelFormat; import android.os.IBinder; import android.util.AndroidRuntimeException; -import android.util.Config; import android.util.Log; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; @@ -102,7 +101,7 @@ public class WindowManagerImpl implements WindowManager { private void addView(View view, ViewGroup.LayoutParams params, boolean nest) { - if (Config.LOGV) Log.v("WindowManager", "addView view=" + view); + if (false) Log.v("WindowManager", "addView view=" + view); if (!(params instanceof WindowManager.LayoutParams)) { throw new IllegalArgumentException( diff --git a/core/java/android/view/WindowOrientationListener.java b/core/java/android/view/WindowOrientationListener.java index 62d3e6a..d128b57 100755 --- a/core/java/android/view/WindowOrientationListener.java +++ b/core/java/android/view/WindowOrientationListener.java @@ -21,7 +21,6 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; -import android.util.Config; import android.util.Log; import android.util.Slog; @@ -47,7 +46,7 @@ import android.util.Slog; public abstract class WindowOrientationListener { private static final String TAG = "WindowOrientationListener"; private static final boolean DEBUG = false; - private static final boolean localLOGV = DEBUG || Config.DEBUG; + private static final boolean localLOGV = DEBUG || false; private SensorManager mSensorManager; private boolean mEnabled; diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index f406da9..22cb0d4 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -16,8 +16,6 @@ package android.view.accessibility; -import static android.util.Config.LOGV; - import android.content.Context; import android.content.pm.ServiceInfo; import android.os.Binder; @@ -166,7 +164,7 @@ public final class AccessibilityManager { long identityToken = Binder.clearCallingIdentity(); doRecycle = mService.sendAccessibilityEvent(event); Binder.restoreCallingIdentity(identityToken); - if (LOGV) { + if (false) { Log.i(LOG_TAG, event + " sent"); } } catch (RemoteException re) { @@ -187,7 +185,7 @@ public final class AccessibilityManager { } try { mService.interrupt(); - if (LOGV) { + if (false) { Log.i(LOG_TAG, "Requested interrupt from all services"); } } catch (RemoteException re) { @@ -204,7 +202,7 @@ public final class AccessibilityManager { List<ServiceInfo> services = null; try { services = mService.getAccessibilityServiceList(); - if (LOGV) { + if (false) { Log.i(LOG_TAG, "Installed AccessibilityServices " + services); } } catch (RemoteException re) { |