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

Commit e2393c57 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge changes 108,130,131 into donut 

* changes:
  util/DebugUtils: Remove references to android.util.Config
  text: Remove references to android.util.Config
  Remove references to android.util.Config
parents 4602d022 34f1ca7b

core/java/android/text/Layout.java

+5 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.graphics.Rect; 
import android.graphics.RectF;

import android.graphics.Path;

import com.android.internal.util.ArrayUtils;

import android.util.Config;



import junit.framework.Assert;

import android.text.style.*;
@@ -39,6 +38,8 @@ import android.view.KeyEvent; 
 * For text that will not change, use a {@link StaticLayout}.

 */

public abstract class Layout {

    private static final boolean DEBUG = false;



    /* package */ static final EmojiFactory EMOJI_FACTORY =

        EmojiFactory.newAvailableInstance();

    /* package */ static final int MIN_EMOJI, MAX_EMOJI;
@@ -330,7 +331,7 @@ public abstract class Layout { 
            boolean hasTab = getLineContainsTab(i);

            if (directions == DIRS_ALL_LEFT_TO_RIGHT &&

                    !spannedText && !hasTab) {

                if (Config.DEBUG) {

                if (DEBUG) {

                    Assert.assertTrue(dir == DIR_LEFT_TO_RIGHT);

                    Assert.assertNotNull(c);

                }
@@ -797,7 +798,7 @@ public abstract class Layout { 
    }

    

    private int getLineVisibleEnd(int line, int start, int end) {

        if (Config.DEBUG) {

        if (DEBUG) {

            Assert.assertTrue(getLineStart(line) == start && getLineStart(line+1) == end);

        }
@@ -1340,7 +1341,7 @@ public abstract class Layout { 
        char[] buf;

        if (!hasTabs) {

            if (directions == DIRS_ALL_LEFT_TO_RIGHT) {

                if (Config.DEBUG) {

                if (DEBUG) {

                    Assert.assertTrue(DIR_LEFT_TO_RIGHT == dir);

                }

                Styled.drawText(canvas, text, start, end, dir, false, x, top, y, bottom, paint, workPaint, false);

core/java/android/util/DebugUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ public class DebugUtils { 
     *

     * <p>This class is useful for debugging and logging purpose:</p>

     * <pre>

     * if (Config.DEBUG) {

     *   if (DebugUtils.isObjectSelected(childView) && Config.LOGV) {

     * if (DEBUG) {

     *   if (DebugUtils.isObjectSelected(childView) && LOGV_ENABLED) {

     *     Log.v(TAG, "Object " + childView + " logged!");

     *   }

     * }

core/java/android/webkit/BrowserFrame.java

+4 −5
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.net.WebAddress; 
import android.net.http.SslCertificate;

import android.os.Handler;

import android.os.Message;

import android.util.Config;

import android.util.Log;

import android.util.TypedValue;
@@ -120,7 +119,7 @@ class BrowserFrame extends Handler { 
        mDatabase = WebViewDatabase.getInstance(context);

        mWebViewCore = w;



        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "BrowserFrame constructor: this=" + this);

        }

    }
@@ -331,7 +330,7 @@ class BrowserFrame extends Handler { 
        switch (msg.what) {

            case FRAME_COMPLETED: {

                if (mSettings.getSavePassword() && hasPasswordField()) {

                    if (Config.DEBUG) {

                    if (WebView.DEBUG) {

                        Assert.assertNotNull(mCallbackProxy.getBackForwardList()

                                .getCurrentItem());

                    }
@@ -480,7 +479,7 @@ class BrowserFrame extends Handler { 
            }

            if (mSettings.getSavePassword() && hasPasswordField()) {

                try {

                    if (Config.DEBUG) {

                    if (WebView.DEBUG) {

                        Assert.assertNotNull(mCallbackProxy.getBackForwardList()

                                .getCurrentItem());

                    }
@@ -528,7 +527,7 @@ class BrowserFrame extends Handler { 
        // is this resource the main-frame top-level page?

        boolean isMainFramePage = mIsMainFrame;



        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "startLoadingResource: url=" + url + ", method="

                    + method + ", postData=" + postData + ", isHighPriority="

                    + isHighPriority + ", isMainFramePage=" + isMainFramePage);

core/java/android/webkit/CacheManager.java

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.webkit; 
import android.content.Context;

import android.net.http.Headers;

import android.os.FileUtils;

import android.util.Config;

import android.util.Log;

import java.io.File;

import java.io.FileInputStream;
@@ -322,7 +321,7 @@ public final class CacheManager { 
            }

        }



        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "getCacheFile for url " + url);

        }
@@ -416,7 +415,7 @@ public final class CacheManager { 


        mDataBase.addCache(url, cacheRet);



        if (Config.LOGV) {

        if (WebView.LOGV_ENABLED) {

            Log.v(LOGTAG, "saveCacheFile for url " + url);

        }

    }

core/java/android/webkit/CallbackProxy.java

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.os.Handler; 
import android.os.Message;

import android.os.SystemClock;

import android.provider.Browser;

import android.util.Config;

import android.util.Log;

import android.view.KeyEvent;

import android.view.LayoutInflater;
@@ -822,7 +821,7 @@ class CallbackProxy extends Handler { 
            String password, Message resumeMsg) {

        // resumeMsg should be null at this point because we want to create it

        // within the CallbackProxy.

        if (Config.DEBUG) {

        if (WebView.DEBUG) {

            junit.framework.Assert.assertNull(resumeMsg);

        }

        resumeMsg = obtainMessage(NOTIFY);