assist: Fix reported colors/styles for TextView/Switch

Changes to the data provided to AssistStructure:
* Text foreground color is correct even if the view has not yet been
painted.
* Text background color is now always 1 (TEXT_COLOR_UNDEFINED) for a
TextView, as it has no separate concept of background color.
* Switch now reports the text size/color/style of the label text
(usually user visible) rather than the on/off text on the button
itself (usually hidden in Material, and not usually revelant when
visible).

Bug: 21080375
Change-Id: I7e15f68d89510a76cab76031c2c8ca6ca3f32435

1 files changed, 1 insertions, 8 deletions

diff --git a/core/java/android/view/ViewStructure.java b/core/java/android/view/ViewStructure.java
index 5c8b023..886547a 100644
--- a/core/java/android/view/ViewStructure.java
+++ b/core/java/android/view/ViewStructure.java
@@ -145,13 +145,6 @@ public abstract class ViewStructure {
     public abstract void setText(CharSequence text, int selectionStart, int selectionEnd);
 
     /**
-     * Set default global style of the text previously set with
-     * {@link #setText}, derived from the given TextPaint object.  Size, foreground color,
-     * background color, and style information will be extracted from the paint.
-     */
-    public abstract void setTextPaint(TextPaint paint);
-
-    /**
      * Explicitly set default global style information for text that was previously set with
      * {@link #setText}.
      *
@@ -160,7 +153,7 @@ public abstract class ViewStructure {
      * @param bgColor The background color, packed as 0xAARRGGBB.
      * @param style Style flags, as defined by {@link android.app.AssistStructure.ViewNode}.
      */
-    public abstract void setTextStyle(int size, int fgColor, int bgColor, int style);
+    public abstract void setTextStyle(float size, int fgColor, int bgColor, int style);
 
     /**
      * Set optional hint text associated with this view; this is for example the text that is