summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-04-20 18:51:45 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-20 18:51:45 -0700
commit7dc3d82a392696ede0757980cd68105682c46768 (patch)
tree0bb82e3b9e84e64efc3f01a4f633c3692f02b11b
parent9392ad25a866ea2dff68683795294103157f8ed7 (diff)
parentd6e716dce95089e3acceef2267175d1dba1b4035 (diff)
downloadframeworks_base-7dc3d82a392696ede0757980cd68105682c46768.zip
frameworks_base-7dc3d82a392696ede0757980cd68105682c46768.tar.gz
frameworks_base-7dc3d82a392696ede0757980cd68105682c46768.tar.bz2
Merge "Adding a couple of missing accessibility focus directions."
-rw-r--r--api/current.txt2
-rw-r--r--core/java/android/view/View.java14
2 files changed, 14 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 4699139..1de70fd 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24080,7 +24080,9 @@ package android.view {
field public static final int ACCESSIBILITY_FOCUS_FORWARD = 4098; // 0x1002
field public static final int ACCESSIBILITY_FOCUS_IN = 4100; // 0x1004
field public static final int ACCESSIBILITY_FOCUS_LEFT = 4113; // 0x1011
+ field public static final int ACCESSIBILITY_FOCUS_NEXT = 4112; // 0x1010
field public static final int ACCESSIBILITY_FOCUS_OUT = 4104; // 0x1008
+ field public static final int ACCESSIBILITY_FOCUS_PREVIOUS = 4128; // 0x1020
field public static final int ACCESSIBILITY_FOCUS_RIGHT = 4162; // 0x1042
field public static final int ACCESSIBILITY_FOCUS_UP = 4129; // 0x1021
field public static final android.util.Property ALPHA;
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index e6d7c02..a299141 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -1045,12 +1045,12 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
public static final int ACCESSIBILITY_FOCUS_DOWN = FOCUS_DOWN | FOCUS_ACCESSIBILITY;
/**
- * Use with {@link #focusSearch(int)}. Move acessibility focus to the next view.
+ * Use with {@link #focusSearch(int)}. Move acessibility focus forward.
*/
public static final int ACCESSIBILITY_FOCUS_FORWARD = FOCUS_FORWARD | FOCUS_ACCESSIBILITY;
/**
- * Use with {@link #focusSearch(int)}. Move acessibility focus to the previous view.
+ * Use with {@link #focusSearch(int)}. Move acessibility focus backward.
*/
public static final int ACCESSIBILITY_FOCUS_BACKWARD = FOCUS_BACKWARD | FOCUS_ACCESSIBILITY;
@@ -1065,6 +1065,16 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
public static final int ACCESSIBILITY_FOCUS_OUT = 0x00000008 | FOCUS_ACCESSIBILITY;
/**
+ * Use with {@link #focusSearch(int)}. Move acessibility focus to the next view.
+ */
+ public static final int ACCESSIBILITY_FOCUS_NEXT = 0x00000010 | FOCUS_ACCESSIBILITY;
+
+ /**
+ * Use with {@link #focusSearch(int)}. Move acessibility focus to the previous view.
+ */
+ public static final int ACCESSIBILITY_FOCUS_PREVIOUS = 0x00000020 | FOCUS_ACCESSIBILITY;
+
+ /**
* Bits of {@link #getMeasuredWidthAndState()} and
* {@link #getMeasuredWidthAndState()} that provide the actual measured size.
*/