Merge "Fix a11y add in TileAdapter" (bfd8b4d3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -414,9 +414,9 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
		public void onLayoutChange(View v, int left, int top, int right, int bottom,
		int oldLeft, int oldTop, int oldRight, int oldBottom) {
		holder.mTileView.removeOnLayoutChangeListener(this);
		holder.mTileView.requestFocus();
		holder.mTileView.requestAccessibilityFocus();
		if (mAccessibilityAction == ACTION_NONE) {
		holder.mTileView.clearFocus();
		holder.mTileView.clearAccessibilityFocus();
		}
		}
		});
		@@ -449,12 +449,13 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
		// Update the tile divider position
		mTileDividerIndex++;
		mFocusIndex = mEditIndex - 1;
		final int focus = mFocusIndex;
		mNeedsFocus = true;
		if (mRecyclerView != null) {
		mRecyclerView.post(() -> {
		final RecyclerView recyclerView = mRecyclerView;
		if (recyclerView != null) {
		recyclerView.smoothScrollToPosition(mFocusIndex);
		recyclerView.smoothScrollToPosition(focus);
		}
		});
		}