Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5ced220 authored by Vadim Tryshev's avatar Vadim Tryshev
Browse files

Eliminating sections. 

Per new UX spec, sections are eliminated, and clusters change
their behavior. Full list of their properties:
* They serve as stops in cluster-navigation loop
* There exists a default cluster (which is the unmarked space)
* Default/stored focus is local to a cluster
* Initial focus search can enter a cluster
* Tab/arrow navigation is not affected by clusters

Bug: 32151632
Test: Manual and CTS tests.
Change-Id: Iacc4f37aec3dc61a6f6ce35681fa6b8fa974f0ed
parent 15470f9b

api/current.txt

+6 −12
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ package android { 














  public static final class R.attr {















    ctor public R.attr();













    field public static final int __removed0 = 16844097; // 0x1010541













    field public static final int __removed1 = 16844099; // 0x1010543















    field public static final int absListViewStyle = 16842858; // 0x101006a















    field public static final int accessibilityEventTypes = 16843648; // 0x1010380















    field public static final int accessibilityFeedbackType = 16843650; // 0x1010382










@@ -756,7 +758,6 @@ package android {













    field public static final int keyboardLayout = 16843691; // 0x10103ab















    field public static final int keyboardMode = 16843341; // 0x101024d















    field public static final int keyboardNavigationCluster = 16844096; // 0x1010540













    field public static final int keyboardNavigationSection = 16844097; // 0x1010541















    field public static final int keycode = 16842949; // 0x10100c5















    field public static final int killAfterRestore = 16843420; // 0x101029c















    field public static final int label = 16842753; // 0x1010001










@@ -906,7 +907,6 @@ package android {













    field public static final int nextFocusLeft = 16842977; // 0x10100e1















    field public static final int nextFocusRight = 16842978; // 0x10100e2















    field public static final int nextFocusUp = 16842979; // 0x10100e3













    field public static final int nextSectionForward = 16844099; // 0x1010543















    field public static final int noHistory = 16843309; // 0x101022d















    field public static final int normalScreens = 16843397; // 0x1010285















    field public static final int notificationTimeout = 16843651; // 0x1010383










@@ -42112,7 +42112,7 @@ package android.view {













    method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);















    method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);















    method public android.view.View findNextFocusFromRect(android.view.ViewGroup, android.graphics.Rect, int);













    method public android.view.View findNextKeyboardNavigationGroup(int, android.view.View, android.view.View, int);













    method public android.view.View findNextKeyboardNavigationCluster(android.view.View, android.view.View, int);















    method public static android.view.FocusFinder getInstance();















  }
























@@ -43410,7 +43410,7 @@ package android.view {













    method public void addChildrenForAccessibility(java.util.ArrayList<android.view.View>);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int, int);













    method public void addKeyboardNavigationGroups(int, java.util.Collection<android.view.View>, int);













    method public void addKeyboardNavigationClusters(java.util.Collection<android.view.View>, int);















    method public void addOnAttachStateChangeListener(android.view.View.OnAttachStateChangeListener);















    method public void addOnLayoutChangeListener(android.view.View.OnLayoutChangeListener);















    method public void addTouchables(java.util.ArrayList<android.view.View>);










@@ -43574,7 +43574,6 @@ package android.view {













    method public int getNextFocusLeftId();















    method public int getNextFocusRightId();















    method public int getNextFocusUpId();













    method public int getNextSectionForwardId();















    method public android.view.View.OnFocusChangeListener getOnFocusChangeListener();















    method public android.view.ViewOutlineProvider getOutlineProvider();















    method public int getOverScrollMode();










@@ -43679,7 +43678,6 @@ package android.view {













    method public boolean isInLayout();















    method public boolean isInTouchMode();















    method public final boolean isKeyboardNavigationCluster();













    method public final boolean isKeyboardNavigationSection();















    method public boolean isLaidOut();















    method public boolean isLayoutDirectionResolved();















    method public boolean isLayoutRequested();









@@ -43702,7 +43700,7 @@ package android.view {













    method public boolean isVerticalFadingEdgeEnabled();















    method public boolean isVerticalScrollBarEnabled();















    method public void jumpDrawablesToCurrentState();













    method public android.view.View keyboardNavigationGroupSearch(int, android.view.View, int);













    method public android.view.View keyboardNavigationClusterSearch(android.view.View, int);















    method public void layout(int, int, int, int);















    method public final void measure(int, int);















    method protected static int[] mergeDrawableStates(int[], int[]);










@@ -43852,7 +43850,6 @@ package android.view {













    method public void setImportantForAccessibility(int);















    method public void setKeepScreenOn(boolean);















    method public void setKeyboardNavigationCluster(boolean);













    method public void setKeyboardNavigationSection(boolean);















    method public void setLabelFor(int);















    method public void setLayerPaint(android.graphics.Paint);















    method public void setLayerType(int, android.graphics.Paint);









@@ -43870,7 +43867,6 @@ package android.view {













    method public void setNextFocusLeftId(int);















    method public void setNextFocusRightId(int);















    method public void setNextFocusUpId(int);













    method public void setNextSectionForwardId(int);















    method public void setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener);















    method public void setOnClickListener(android.view.View.OnClickListener);















    method public void setOnContextClickListener(android.view.View.OnContextClickListener);










@@ -43996,8 +43992,6 @@ package android.view {













    field public static final int IMPORTANT_FOR_ACCESSIBILITY_YES = 1; // 0x1















    field public static final int INVISIBLE = 4; // 0x4















    field public static final int KEEP_SCREEN_ON = 67108864; // 0x4000000













    field public static final int KEYBOARD_NAVIGATION_GROUP_CLUSTER = 1; // 0x1













    field public static final int KEYBOARD_NAVIGATION_GROUP_SECTION = 2; // 0x2















    field public static final int LAYER_TYPE_HARDWARE = 2; // 0x2















    field public static final int LAYER_TYPE_NONE = 0; // 0x0















    field public static final int LAYER_TYPE_SOFTWARE = 1; // 0x1










@@ -44516,7 +44510,7 @@ package android.view {













    method public abstract boolean isLayoutRequested();















    method public abstract boolean isTextAlignmentResolved();















    method public abstract boolean isTextDirectionResolved();













    method public abstract android.view.View keyboardNavigationGroupSearch(int, android.view.View, int);













    method public abstract android.view.View keyboardNavigationClusterSearch(android.view.View, int);















    method public abstract void notifySubtreeAccessibilityStateChanged(android.view.View, android.view.View, int);















    method public abstract boolean onNestedFling(android.view.View, float, float, boolean);















    method public abstract boolean onNestedPreFling(android.view.View, float, float);

























api/system-current.txt



+6
−12




























Original line number
Diff line number
Diff line








@@ -311,6 +311,8 @@ package android {



























  public static final class R.attr {















    ctor public R.attr();













    field public static final int __removed0 = 16844097; // 0x1010541













    field public static final int __removed1 = 16844099; // 0x1010543















    field public static final int absListViewStyle = 16842858; // 0x101006a















    field public static final int accessibilityEventTypes = 16843648; // 0x1010380















    field public static final int accessibilityFeedbackType = 16843650; // 0x1010382










@@ -865,7 +867,6 @@ package android {













    field public static final int keyboardLayout = 16843691; // 0x10103ab















    field public static final int keyboardMode = 16843341; // 0x101024d















    field public static final int keyboardNavigationCluster = 16844096; // 0x1010540













    field public static final int keyboardNavigationSection = 16844097; // 0x1010541















    field public static final int keycode = 16842949; // 0x10100c5















    field public static final int killAfterRestore = 16843420; // 0x101029c















    field public static final int label = 16842753; // 0x1010001










@@ -1015,7 +1016,6 @@ package android {













    field public static final int nextFocusLeft = 16842977; // 0x10100e1















    field public static final int nextFocusRight = 16842978; // 0x10100e2















    field public static final int nextFocusUp = 16842979; // 0x10100e3













    field public static final int nextSectionForward = 16844099; // 0x1010543















    field public static final int noHistory = 16843309; // 0x101022d















    field public static final int normalScreens = 16843397; // 0x1010285















    field public static final int notificationTimeout = 16843651; // 0x1010383










@@ -45372,7 +45372,7 @@ package android.view {













    method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);















    method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);















    method public android.view.View findNextFocusFromRect(android.view.ViewGroup, android.graphics.Rect, int);













    method public android.view.View findNextKeyboardNavigationGroup(int, android.view.View, android.view.View, int);













    method public android.view.View findNextKeyboardNavigationCluster(android.view.View, android.view.View, int);















    method public static android.view.FocusFinder getInstance();















  }
























@@ -46670,7 +46670,7 @@ package android.view {













    method public void addChildrenForAccessibility(java.util.ArrayList<android.view.View>);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int, int);













    method public void addKeyboardNavigationGroups(int, java.util.Collection<android.view.View>, int);













    method public void addKeyboardNavigationClusters(java.util.Collection<android.view.View>, int);















    method public void addOnAttachStateChangeListener(android.view.View.OnAttachStateChangeListener);















    method public void addOnLayoutChangeListener(android.view.View.OnLayoutChangeListener);















    method public void addTouchables(java.util.ArrayList<android.view.View>);










@@ -46834,7 +46834,6 @@ package android.view {













    method public int getNextFocusLeftId();















    method public int getNextFocusRightId();















    method public int getNextFocusUpId();













    method public int getNextSectionForwardId();















    method public android.view.View.OnFocusChangeListener getOnFocusChangeListener();















    method public android.view.ViewOutlineProvider getOutlineProvider();















    method public int getOverScrollMode();










@@ -46939,7 +46938,6 @@ package android.view {













    method public boolean isInLayout();















    method public boolean isInTouchMode();















    method public final boolean isKeyboardNavigationCluster();













    method public final boolean isKeyboardNavigationSection();















    method public boolean isLaidOut();















    method public boolean isLayoutDirectionResolved();















    method public boolean isLayoutRequested();









@@ -46962,7 +46960,7 @@ package android.view {













    method public boolean isVerticalFadingEdgeEnabled();















    method public boolean isVerticalScrollBarEnabled();















    method public void jumpDrawablesToCurrentState();













    method public android.view.View keyboardNavigationGroupSearch(int, android.view.View, int);













    method public android.view.View keyboardNavigationClusterSearch(android.view.View, int);















    method public void layout(int, int, int, int);















    method public final void measure(int, int);















    method protected static int[] mergeDrawableStates(int[], int[]);










@@ -47112,7 +47110,6 @@ package android.view {













    method public void setImportantForAccessibility(int);















    method public void setKeepScreenOn(boolean);















    method public void setKeyboardNavigationCluster(boolean);













    method public void setKeyboardNavigationSection(boolean);















    method public void setLabelFor(int);















    method public void setLayerPaint(android.graphics.Paint);















    method public void setLayerType(int, android.graphics.Paint);









@@ -47130,7 +47127,6 @@ package android.view {













    method public void setNextFocusLeftId(int);















    method public void setNextFocusRightId(int);















    method public void setNextFocusUpId(int);













    method public void setNextSectionForwardId(int);















    method public void setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener);















    method public void setOnClickListener(android.view.View.OnClickListener);















    method public void setOnContextClickListener(android.view.View.OnContextClickListener);










@@ -47256,8 +47252,6 @@ package android.view {













    field public static final int IMPORTANT_FOR_ACCESSIBILITY_YES = 1; // 0x1















    field public static final int INVISIBLE = 4; // 0x4















    field public static final int KEEP_SCREEN_ON = 67108864; // 0x4000000













    field public static final int KEYBOARD_NAVIGATION_GROUP_CLUSTER = 1; // 0x1













    field public static final int KEYBOARD_NAVIGATION_GROUP_SECTION = 2; // 0x2















    field public static final int LAYER_TYPE_HARDWARE = 2; // 0x2















    field public static final int LAYER_TYPE_NONE = 0; // 0x0















    field public static final int LAYER_TYPE_SOFTWARE = 1; // 0x1










@@ -47776,7 +47770,7 @@ package android.view {













    method public abstract boolean isLayoutRequested();















    method public abstract boolean isTextAlignmentResolved();















    method public abstract boolean isTextDirectionResolved();













    method public abstract android.view.View keyboardNavigationGroupSearch(int, android.view.View, int);













    method public abstract android.view.View keyboardNavigationClusterSearch(android.view.View, int);















    method public abstract void notifySubtreeAccessibilityStateChanged(android.view.View, android.view.View, int);















    method public abstract boolean onNestedFling(android.view.View, float, float, boolean);















    method public abstract boolean onNestedPreFling(android.view.View, float, float);

























api/test-current.txt



+6
−12




























Original line number
Diff line number
Diff line








@@ -202,6 +202,8 @@ package android {



























  public static final class R.attr {















    ctor public R.attr();













    field public static final int __removed0 = 16844097; // 0x1010541













    field public static final int __removed1 = 16844099; // 0x1010543















    field public static final int absListViewStyle = 16842858; // 0x101006a















    field public static final int accessibilityEventTypes = 16843648; // 0x1010380















    field public static final int accessibilityFeedbackType = 16843650; // 0x1010382










@@ -756,7 +758,6 @@ package android {













    field public static final int keyboardLayout = 16843691; // 0x10103ab















    field public static final int keyboardMode = 16843341; // 0x101024d















    field public static final int keyboardNavigationCluster = 16844096; // 0x1010540













    field public static final int keyboardNavigationSection = 16844097; // 0x1010541















    field public static final int keycode = 16842949; // 0x10100c5















    field public static final int killAfterRestore = 16843420; // 0x101029c















    field public static final int label = 16842753; // 0x1010001










@@ -906,7 +907,6 @@ package android {













    field public static final int nextFocusLeft = 16842977; // 0x10100e1















    field public static final int nextFocusRight = 16842978; // 0x10100e2















    field public static final int nextFocusUp = 16842979; // 0x10100e3













    field public static final int nextSectionForward = 16844099; // 0x1010543















    field public static final int noHistory = 16843309; // 0x101022d















    field public static final int normalScreens = 16843397; // 0x1010285















    field public static final int notificationTimeout = 16843651; // 0x1010383










@@ -42401,7 +42401,7 @@ package android.view {













    method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);















    method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);















    method public android.view.View findNextFocusFromRect(android.view.ViewGroup, android.graphics.Rect, int);













    method public android.view.View findNextKeyboardNavigationGroup(int, android.view.View, android.view.View, int);













    method public android.view.View findNextKeyboardNavigationCluster(android.view.View, android.view.View, int);















    method public static android.view.FocusFinder getInstance();















  }
























@@ -43701,7 +43701,7 @@ package android.view {













    method public void addChildrenForAccessibility(java.util.ArrayList<android.view.View>);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int);















    method public void addFocusables(java.util.ArrayList<android.view.View>, int, int);













    method public void addKeyboardNavigationGroups(int, java.util.Collection<android.view.View>, int);













    method public void addKeyboardNavigationClusters(java.util.Collection<android.view.View>, int);















    method public void addOnAttachStateChangeListener(android.view.View.OnAttachStateChangeListener);















    method public void addOnLayoutChangeListener(android.view.View.OnLayoutChangeListener);















    method public void addTouchables(java.util.ArrayList<android.view.View>);










@@ -43865,7 +43865,6 @@ package android.view {













    method public int getNextFocusLeftId();















    method public int getNextFocusRightId();















    method public int getNextFocusUpId();













    method public int getNextSectionForwardId();















    method public android.view.View.OnFocusChangeListener getOnFocusChangeListener();















    method public android.view.ViewOutlineProvider getOutlineProvider();















    method public int getOverScrollMode();










@@ -43971,7 +43970,6 @@ package android.view {













    method public boolean isInLayout();















    method public boolean isInTouchMode();















    method public final boolean isKeyboardNavigationCluster();













    method public final boolean isKeyboardNavigationSection();















    method public boolean isLaidOut();















    method public boolean isLayoutDirectionResolved();















    method public boolean isLayoutRequested();









@@ -43994,7 +43992,7 @@ package android.view {













    method public boolean isVerticalFadingEdgeEnabled();















    method public boolean isVerticalScrollBarEnabled();















    method public void jumpDrawablesToCurrentState();













    method public android.view.View keyboardNavigationGroupSearch(int, android.view.View, int);













    method public android.view.View keyboardNavigationClusterSearch(android.view.View, int);















    method public void layout(int, int, int, int);















    method public final void measure(int, int);















    method protected static int[] mergeDrawableStates(int[], int[]);










@@ -44144,7 +44142,6 @@ package android.view {













    method public void setImportantForAccessibility(int);















    method public void setKeepScreenOn(boolean);















    method public void setKeyboardNavigationCluster(boolean);













    method public void setKeyboardNavigationSection(boolean);















    method public void setLabelFor(int);















    method public void setLayerPaint(android.graphics.Paint);















    method public void setLayerType(int, android.graphics.Paint);









@@ -44162,7 +44159,6 @@ package android.view {













    method public void setNextFocusLeftId(int);















    method public void setNextFocusRightId(int);















    method public void setNextFocusUpId(int);













    method public void setNextSectionForwardId(int);















    method public void setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener);















    method public void setOnClickListener(android.view.View.OnClickListener);















    method public void setOnContextClickListener(android.view.View.OnContextClickListener);










@@ -44288,8 +44284,6 @@ package android.view {













    field public static final int IMPORTANT_FOR_ACCESSIBILITY_YES = 1; // 0x1















    field public static final int INVISIBLE = 4; // 0x4















    field public static final int KEEP_SCREEN_ON = 67108864; // 0x4000000













    field public static final int KEYBOARD_NAVIGATION_GROUP_CLUSTER = 1; // 0x1













    field public static final int KEYBOARD_NAVIGATION_GROUP_SECTION = 2; // 0x2















    field public static final int LAYER_TYPE_HARDWARE = 2; // 0x2















    field public static final int LAYER_TYPE_NONE = 0; // 0x0















    field public static final int LAYER_TYPE_SOFTWARE = 1; // 0x1










@@ -44812,7 +44806,7 @@ package android.view {













    method public abstract boolean isLayoutRequested();















    method public abstract boolean isTextAlignmentResolved();















    method public abstract boolean isTextDirectionResolved();













    method public abstract android.view.View keyboardNavigationGroupSearch(int, android.view.View, int);













    method public abstract android.view.View keyboardNavigationClusterSearch(android.view.View, int);















    method public abstract void notifySubtreeAccessibilityStateChanged(android.view.View, android.view.View, int);















    method public abstract boolean onNestedFling(android.view.View, float, float, boolean);















    method public abstract boolean onNestedPreFling(android.view.View, float, float);

























core/java/android/view/FocusFinder.java



+48
−78


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/view/View.java



+20
−131


























File changed.
Preview size limit exceeded, changes collapsed.