commit 6bcc8473aeb671dbaaea17ad15a17032ddd1bd4c
author Alan Viverette <alanv@google.com> Wed May 25 20:03:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 20:03:33 2016 +0000
tree bd436b56148be7fa47f8f27c179fbfeb913198a1
parent 6002133545b0c33bcc4051074b34c90e8c555eb9
parent d6558efbe0fbf3c3e85adb1241894590ef3be6c2

Merge "Revert "Fix build"" into nyc-dev am: 1b5ec362c2
am: d6558efbe0

* commit 'd6558efbe0fbf3c3e85adb1241894590ef3be6c2':
  Revert "Fix build"

Change-Id: Ic152c58ca975eb178150d9bb8662f16ca563fdcb

v4/api/current.txt

diff --git a/v4/api/current.txt b/v4/api/current.txt
index f7cf441..89e6daa 100644
--- a/v4/api/current.txt
+++ b/v4/api/current.txt
@@ -2969,7 +2969,6 @@
     method public android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.CollectionInfoCompat getCollectionInfo();
     method public android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.CollectionItemInfoCompat getCollectionItemInfo();
     method public java.lang.CharSequence getContentDescription();
-    method public int getDrawingOrder();
     method public java.lang.CharSequence getError();
     method public android.os.Bundle getExtras();
     method public java.lang.Object getInfo();
@@ -3001,7 +3000,6 @@
     method public boolean isEnabled();
     method public boolean isFocusable();
     method public boolean isFocused();
-    method public boolean isImportantForAccessibility();
     method public boolean isLongClickable();
     method public boolean isMultiLine();
     method public boolean isPassword();
@@ -3032,13 +3030,11 @@
     method public void setContentDescription(java.lang.CharSequence);
     method public void setContentInvalid(boolean);
     method public void setDismissable(boolean);
-    method public void setDrawingOrder(int);
     method public void setEditable(boolean);
     method public void setEnabled(boolean);
     method public void setError(java.lang.CharSequence);
     method public void setFocusable(boolean);
     method public void setFocused(boolean);
-    method public void setImportantForAccessibility(boolean);
     method public void setInputType(int);
     method public void setLabelFor(android.view.View);
     method public void setLabelFor(android.view.View, int);
@@ -3162,14 +3158,6 @@
     field public static final int RANGE_TYPE_PERCENT = 2; // 0x2
   }
 
-  public class AccessibilityNodeInfoCompatApi24 {
-    ctor public AccessibilityNodeInfoCompatApi24();
-    method public static int getDrawingOrder(java.lang.Object);
-    method public static boolean isImportantForAccessibility(java.lang.Object);
-    method public static void setDrawingOrder(java.lang.Object, int);
-    method public static void setImportantForAccessibility(java.lang.Object, boolean);
-  }
-
   public class AccessibilityNodeProviderCompat {
     ctor public AccessibilityNodeProviderCompat();
     ctor public AccessibilityNodeProviderCompat(java.lang.Object);
@@ -3232,7 +3220,6 @@
   }
 
   public class AccessibilityWindowInfoCompat {
-    method public android.support.v4.view.accessibility.AccessibilityNodeInfoCompat getAnchor();
     method public void getBoundsInScreen(android.graphics.Rect);
     method public android.support.v4.view.accessibility.AccessibilityWindowInfoCompat getChild(int);
     method public int getChildCount();
@@ -3240,7 +3227,6 @@
     method public int getLayer();
     method public android.support.v4.view.accessibility.AccessibilityWindowInfoCompat getParent();
     method public android.support.v4.view.accessibility.AccessibilityNodeInfoCompat getRoot();
-    method public java.lang.CharSequence getTitle();
     method public int getType();
     method public boolean isAccessibilityFocused();
     method public boolean isActive();
@@ -3254,12 +3240,6 @@
     field public static final int TYPE_SYSTEM = 3; // 0x3
   }
 
-  public class AccessibilityWindowInfoCompatApi24 {
-    ctor public AccessibilityWindowInfoCompatApi24();
-    method public static java.lang.Object getAnchor(java.lang.Object);
-    method public static java.lang.CharSequence getTitle(java.lang.Object);
-  }
-
 }
 
 package android.support.v4.view.animation {