From f1d939910f1c9580297878cd13784a0f4b3be3a4 Mon Sep 17 00:00:00 2001 From: Abodunrinwa Toki Date: Fri, 2 Mar 2018 13:53:21 +0000 Subject: [PATCH] Merge textclassifier/logging/ into textclassifier/ This is based on feedback on Ib5af1ec80a38432d1201fbc913acdc3597d6ba82 Bug: 74466564 Bug: 67609167 Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest Test: bit CtsViewTestCases:android.view.textclassifier.cts.LoggerTest Merged-In: Ic8d58acb2bbd63cedcac4aa16940b4ac852aadc8 Change-Id: Ic8d58acb2bbd63cedcac4aa16940b4ac852aadc8 --- api/current.txt | 142 +++++++++--------- .../{logging => }/DefaultLogger.java | 2 +- .../{logging => }/GenerateLinksLogger.java | 4 +- .../textclassifier/{logging => }/Logger.java | 5 +- .../{logging => }/SelectionEvent.java | 2 +- .../view/textclassifier/TextClassifier.java | 1 - .../textclassifier/TextClassifierImpl.java | 3 - .../widget/SelectionActionModeHelper.java | 4 +- .../logging/GenerateLinksLoggerTest.java | 1 + 9 files changed, 76 insertions(+), 88 deletions(-) rename core/java/android/view/textclassifier/{logging => }/DefaultLogger.java (99%) rename core/java/android/view/textclassifier/{logging => }/GenerateLinksLogger.java (97%) rename core/java/android/view/textclassifier/{logging => }/Logger.java (98%) rename core/java/android/view/textclassifier/{logging => }/SelectionEvent.java (99%) diff --git a/api/current.txt b/api/current.txt index 2875e34de049a..1e4229dae3f3b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -51036,6 +51036,74 @@ package android.view.inputmethod { package android.view.textclassifier { + public abstract class Logger { + ctor public Logger(android.view.textclassifier.Logger.Config); + method public java.text.BreakIterator getTokenIterator(java.util.Locale); + method public boolean isSmartSelection(java.lang.String); + method public final void logSelectionActionEvent(int, int, int); + method public final void logSelectionActionEvent(int, int, int, android.view.textclassifier.TextClassification); + method public final void logSelectionModifiedEvent(int, int); + method public final void logSelectionModifiedEvent(int, int, android.view.textclassifier.TextClassification); + method public final void logSelectionModifiedEvent(int, int, android.view.textclassifier.TextSelection); + method public final void logSelectionStartedEvent(int, int); + method public abstract void writeEvent(android.view.textclassifier.SelectionEvent); + field public static final int OUT_OF_BOUNDS = 2147483647; // 0x7fffffff + field public static final int OUT_OF_BOUNDS_NEGATIVE = -2147483648; // 0x80000000 + field public static final java.lang.String WIDGET_CUSTOM_EDITTEXT = "customedit"; + field public static final java.lang.String WIDGET_CUSTOM_TEXTVIEW = "customview"; + field public static final java.lang.String WIDGET_CUSTOM_UNSELECTABLE_TEXTVIEW = "nosel-customview"; + field public static final java.lang.String WIDGET_EDITTEXT = "edittext"; + field public static final java.lang.String WIDGET_EDIT_WEBVIEW = "edit-webview"; + field public static final java.lang.String WIDGET_TEXTVIEW = "textview"; + field public static final java.lang.String WIDGET_UNKNOWN = "unknown"; + field public static final java.lang.String WIDGET_UNSELECTABLE_TEXTVIEW = "nosel-textview"; + field public static final java.lang.String WIDGET_WEBVIEW = "webview"; + } + + public static final class Logger.Config { + ctor public Logger.Config(android.content.Context, java.lang.String, java.lang.String); + method public java.lang.String getPackageName(); + method public java.lang.String getWidgetType(); + method public java.lang.String getWidgetVersion(); + } + + public final class SelectionEvent { + method public long getDurationSincePreviousEvent(); + method public long getDurationSinceSessionStart(); + method public int getEnd(); + method public java.lang.String getEntityType(); + method public int getEventIndex(); + method public long getEventTime(); + method public int getEventType(); + method public int getInvocationMethod(); + method public java.lang.String getPackageName(); + method public java.lang.String getSessionId(); + method public java.lang.String getSignature(); + method public int getSmartEnd(); + method public int getSmartStart(); + method public int getStart(); + method public java.lang.String getWidgetType(); + method public java.lang.String getWidgetVersion(); + field public static final int ACTION_ABANDON = 107; // 0x6b + field public static final int ACTION_COPY = 101; // 0x65 + field public static final int ACTION_CUT = 103; // 0x67 + field public static final int ACTION_DRAG = 106; // 0x6a + field public static final int ACTION_OTHER = 108; // 0x6c + field public static final int ACTION_OVERTYPE = 100; // 0x64 + field public static final int ACTION_PASTE = 102; // 0x66 + field public static final int ACTION_RESET = 201; // 0xc9 + field public static final int ACTION_SELECT_ALL = 200; // 0xc8 + field public static final int ACTION_SHARE = 104; // 0x68 + field public static final int ACTION_SMART_SHARE = 105; // 0x69 + field public static final int EVENT_AUTO_SELECTION = 5; // 0x5 + field public static final int EVENT_SELECTION_MODIFIED = 2; // 0x2 + field public static final int EVENT_SELECTION_STARTED = 1; // 0x1 + field public static final int EVENT_SMART_SELECTION_MULTI = 4; // 0x4 + field public static final int EVENT_SMART_SELECTION_SINGLE = 3; // 0x3 + field public static final int INVOCATION_LINK = 2; // 0x2 + field public static final int INVOCATION_MANUAL = 1; // 0x1 + } + public final class TextClassification implements android.os.Parcelable { method public int describeContents(); method public float getConfidenceScore(java.lang.String); @@ -51092,7 +51160,7 @@ package android.view.textclassifier { method public default android.view.textclassifier.TextClassification classifyText(java.lang.CharSequence, int, int, android.os.LocaleList); method public default android.view.textclassifier.TextLinks generateLinks(java.lang.CharSequence, android.view.textclassifier.TextLinks.Options); method public default android.view.textclassifier.TextLinks generateLinks(java.lang.CharSequence); - method public default android.view.textclassifier.logging.Logger getLogger(android.view.textclassifier.logging.Logger.Config); + method public default android.view.textclassifier.Logger getLogger(android.view.textclassifier.Logger.Config); method public default int getMaxGenerateLinksTextLength(); method public default android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int, android.view.textclassifier.TextSelection.Options); method public default android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int); @@ -51205,78 +51273,6 @@ package android.view.textclassifier { } -package android.view.textclassifier.logging { - - public abstract class Logger { - ctor public Logger(android.view.textclassifier.logging.Logger.Config); - method public java.text.BreakIterator getTokenIterator(java.util.Locale); - method public boolean isSmartSelection(java.lang.String); - method public final void logSelectionActionEvent(int, int, int); - method public final void logSelectionActionEvent(int, int, int, android.view.textclassifier.TextClassification); - method public final void logSelectionModifiedEvent(int, int); - method public final void logSelectionModifiedEvent(int, int, android.view.textclassifier.TextClassification); - method public final void logSelectionModifiedEvent(int, int, android.view.textclassifier.TextSelection); - method public final void logSelectionStartedEvent(int, int); - method public abstract void writeEvent(android.view.textclassifier.logging.SelectionEvent); - field public static final int OUT_OF_BOUNDS = 2147483647; // 0x7fffffff - field public static final int OUT_OF_BOUNDS_NEGATIVE = -2147483648; // 0x80000000 - field public static final java.lang.String WIDGET_CUSTOM_EDITTEXT = "customedit"; - field public static final java.lang.String WIDGET_CUSTOM_TEXTVIEW = "customview"; - field public static final java.lang.String WIDGET_CUSTOM_UNSELECTABLE_TEXTVIEW = "nosel-customview"; - field public static final java.lang.String WIDGET_EDITTEXT = "edittext"; - field public static final java.lang.String WIDGET_EDIT_WEBVIEW = "edit-webview"; - field public static final java.lang.String WIDGET_TEXTVIEW = "textview"; - field public static final java.lang.String WIDGET_UNKNOWN = "unknown"; - field public static final java.lang.String WIDGET_UNSELECTABLE_TEXTVIEW = "nosel-textview"; - field public static final java.lang.String WIDGET_WEBVIEW = "webview"; - } - - public static final class Logger.Config { - ctor public Logger.Config(android.content.Context, java.lang.String, java.lang.String); - method public java.lang.String getPackageName(); - method public java.lang.String getWidgetType(); - method public java.lang.String getWidgetVersion(); - } - - public final class SelectionEvent { - method public long getDurationSincePreviousEvent(); - method public long getDurationSinceSessionStart(); - method public int getEnd(); - method public java.lang.String getEntityType(); - method public int getEventIndex(); - method public long getEventTime(); - method public int getEventType(); - method public int getInvocationMethod(); - method public java.lang.String getPackageName(); - method public java.lang.String getSessionId(); - method public java.lang.String getSignature(); - method public int getSmartEnd(); - method public int getSmartStart(); - method public int getStart(); - method public java.lang.String getWidgetType(); - method public java.lang.String getWidgetVersion(); - field public static final int ACTION_ABANDON = 107; // 0x6b - field public static final int ACTION_COPY = 101; // 0x65 - field public static final int ACTION_CUT = 103; // 0x67 - field public static final int ACTION_DRAG = 106; // 0x6a - field public static final int ACTION_OTHER = 108; // 0x6c - field public static final int ACTION_OVERTYPE = 100; // 0x64 - field public static final int ACTION_PASTE = 102; // 0x66 - field public static final int ACTION_RESET = 201; // 0xc9 - field public static final int ACTION_SELECT_ALL = 200; // 0xc8 - field public static final int ACTION_SHARE = 104; // 0x68 - field public static final int ACTION_SMART_SHARE = 105; // 0x69 - field public static final int EVENT_AUTO_SELECTION = 5; // 0x5 - field public static final int EVENT_SELECTION_MODIFIED = 2; // 0x2 - field public static final int EVENT_SELECTION_STARTED = 1; // 0x1 - field public static final int EVENT_SMART_SELECTION_MULTI = 4; // 0x4 - field public static final int EVENT_SMART_SELECTION_SINGLE = 3; // 0x3 - field public static final int INVOCATION_LINK = 2; // 0x2 - field public static final int INVOCATION_MANUAL = 1; // 0x1 - } - -} - package android.view.textservice { public final class SentenceSuggestionsInfo implements android.os.Parcelable { diff --git a/core/java/android/view/textclassifier/logging/DefaultLogger.java b/core/java/android/view/textclassifier/DefaultLogger.java similarity index 99% rename from core/java/android/view/textclassifier/logging/DefaultLogger.java rename to core/java/android/view/textclassifier/DefaultLogger.java index f510879cf4014..b2f4e399da5b6 100644 --- a/core/java/android/view/textclassifier/logging/DefaultLogger.java +++ b/core/java/android/view/textclassifier/DefaultLogger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.view.textclassifier.logging; +package android.view.textclassifier; import android.annotation.NonNull; import android.content.Context; diff --git a/core/java/android/view/textclassifier/logging/GenerateLinksLogger.java b/core/java/android/view/textclassifier/GenerateLinksLogger.java similarity index 97% rename from core/java/android/view/textclassifier/logging/GenerateLinksLogger.java rename to core/java/android/view/textclassifier/GenerateLinksLogger.java index fb6f205eb4625..73cf43b87ea70 100644 --- a/core/java/android/view/textclassifier/logging/GenerateLinksLogger.java +++ b/core/java/android/view/textclassifier/GenerateLinksLogger.java @@ -14,14 +14,12 @@ * limitations under the License. */ -package android.view.textclassifier.logging; +package android.view.textclassifier; import android.annotation.Nullable; import android.metrics.LogMaker; import android.util.ArrayMap; import android.util.Log; -import android.view.textclassifier.TextClassifier; -import android.view.textclassifier.TextLinks; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.MetricsLogger; diff --git a/core/java/android/view/textclassifier/logging/Logger.java b/core/java/android/view/textclassifier/Logger.java similarity index 98% rename from core/java/android/view/textclassifier/logging/Logger.java rename to core/java/android/view/textclassifier/Logger.java index 4448b2b5b494d..a4f5bf17066c9 100644 --- a/core/java/android/view/textclassifier/logging/Logger.java +++ b/core/java/android/view/textclassifier/Logger.java @@ -14,16 +14,13 @@ * limitations under the License. */ -package android.view.textclassifier.logging; +package android.view.textclassifier; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.StringDef; import android.content.Context; import android.util.Log; -import android.view.textclassifier.TextClassification; -import android.view.textclassifier.TextClassifier; -import android.view.textclassifier.TextSelection; import com.android.internal.util.Preconditions; diff --git a/core/java/android/view/textclassifier/logging/SelectionEvent.java b/core/java/android/view/textclassifier/SelectionEvent.java similarity index 99% rename from core/java/android/view/textclassifier/logging/SelectionEvent.java rename to core/java/android/view/textclassifier/SelectionEvent.java index a8de3088d8cc6..90fd921b024e2 100644 --- a/core/java/android/view/textclassifier/logging/SelectionEvent.java +++ b/core/java/android/view/textclassifier/SelectionEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.view.textclassifier.logging; +package android.view.textclassifier; import android.annotation.IntDef; import android.annotation.Nullable; diff --git a/core/java/android/view/textclassifier/TextClassifier.java b/core/java/android/view/textclassifier/TextClassifier.java index ec40fdd0ffb1c..ebd2ff983bcb4 100644 --- a/core/java/android/view/textclassifier/TextClassifier.java +++ b/core/java/android/view/textclassifier/TextClassifier.java @@ -28,7 +28,6 @@ import android.os.Parcel; import android.os.Parcelable; import android.util.ArraySet; import android.util.Slog; -import android.view.textclassifier.logging.Logger; import com.android.internal.util.Preconditions; diff --git a/core/java/android/view/textclassifier/TextClassifierImpl.java b/core/java/android/view/textclassifier/TextClassifierImpl.java index 41f1c69a47edc..0a052699590a8 100644 --- a/core/java/android/view/textclassifier/TextClassifierImpl.java +++ b/core/java/android/view/textclassifier/TextClassifierImpl.java @@ -34,9 +34,6 @@ import android.os.UserManager; import android.provider.Browser; import android.provider.CalendarContract; import android.provider.ContactsContract; -import android.view.textclassifier.logging.DefaultLogger; -import android.view.textclassifier.logging.GenerateLinksLogger; -import android.view.textclassifier.logging.Logger; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.Preconditions; diff --git a/core/java/android/widget/SelectionActionModeHelper.java b/core/java/android/widget/SelectionActionModeHelper.java index 8e93078fb1b56..629f531928139 100644 --- a/core/java/android/widget/SelectionActionModeHelper.java +++ b/core/java/android/widget/SelectionActionModeHelper.java @@ -33,13 +33,13 @@ import android.text.Spannable; import android.text.TextUtils; import android.util.Log; import android.view.ActionMode; +import android.view.textclassifier.Logger; +import android.view.textclassifier.SelectionEvent; import android.view.textclassifier.TextClassification; import android.view.textclassifier.TextClassificationConstants; import android.view.textclassifier.TextClassificationManager; import android.view.textclassifier.TextClassifier; import android.view.textclassifier.TextSelection; -import android.view.textclassifier.logging.Logger; -import android.view.textclassifier.logging.SelectionEvent; import android.widget.Editor.SelectionModifierCursorController; import com.android.internal.annotations.VisibleForTesting; diff --git a/core/tests/coretests/src/android/view/textclassifier/logging/GenerateLinksLoggerTest.java b/core/tests/coretests/src/android/view/textclassifier/logging/GenerateLinksLoggerTest.java index b920ca30d6a1d..8e4f02c668b7e 100644 --- a/core/tests/coretests/src/android/view/textclassifier/logging/GenerateLinksLoggerTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/logging/GenerateLinksLoggerTest.java @@ -26,6 +26,7 @@ import android.metrics.LogMaker; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import android.util.ArrayMap; +import android.view.textclassifier.GenerateLinksLogger; import android.view.textclassifier.TextClassifier; import android.view.textclassifier.TextLinks;