Merge "Added TestApi for default focus highlight" into pi-dev
diff --git a/api/test-current.txt b/api/test-current.txt
index dd16771..79de3f6 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1066,6 +1066,7 @@
public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {
method public android.view.View getTooltipView();
+ method public static boolean isDefaultFocusHighlightEnabled();
method public boolean isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
method public boolean restoreFocusInCluster(int);
method public boolean restoreFocusNotInCluster();
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 18c3d76..63f4824 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -27592,6 +27592,15 @@
}
/**
+ * @return {@code true} if the default focus highlight is enabled, {@code false} otherwies.
+ * @hide
+ */
+ @TestApi
+ public static boolean isDefaultFocusHighlightEnabled() {
+ return sUseDefaultFocusHighlight;
+ }
+
+ /**
* Allows this view to handle {@link KeyEvent}s which weren't handled by normal dispatch. This
* occurs after the normal view hierarchy dispatch, but before the window callback. By default,
* this will dispatch into all the listeners registered via