Dragging is not supported neither by TalkBack or the accessibility + * framework at the moment. So we need custom actions to be able + * to change the order of the locales.
+ * + *Also, the remove functionality is difficult to discover and use + * with TalkBack only, so we are also adding a "remove" action.
+ * + *It only removes one locale at the time, but most users don't + * really add many locales "by mistake", so there is no real need + * to delete a lot of locales at once.
+ */ +public class LocaleLinearLayoutManager extends LinearLayoutManager { + private final LocaleDragAndDropAdapter mAdapter; + private final Context mContext; + + private final AccessibilityNodeInfoCompat.AccessibilityActionCompat mActionMoveUp; + private final AccessibilityNodeInfoCompat.AccessibilityActionCompat mActionMoveDown; + private final AccessibilityNodeInfoCompat.AccessibilityActionCompat mActionMoveTop; + private final AccessibilityNodeInfoCompat.AccessibilityActionCompat mActionMoveBottom; + private final AccessibilityNodeInfoCompat.AccessibilityActionCompat mActionRemove; + + public LocaleLinearLayoutManager(Context context, LocaleDragAndDropAdapter adapter) { + super(context); + this.mContext = context; + this.mAdapter = adapter; + + this.mActionMoveUp = new AccessibilityNodeInfoCompat.AccessibilityActionCompat( + R.id.action_drag_move_up, + mContext.getString(R.string.action_drag_label_move_up)); + this.mActionMoveDown = new AccessibilityNodeInfoCompat.AccessibilityActionCompat( + R.id.action_drag_move_down, + mContext.getString(R.string.action_drag_label_move_down)); + this.mActionMoveTop = new AccessibilityNodeInfoCompat.AccessibilityActionCompat( + R.id.action_drag_move_top, + mContext.getString(R.string.action_drag_label_move_top)); + this.mActionMoveBottom = new AccessibilityNodeInfoCompat.AccessibilityActionCompat( + R.id.action_drag_move_bottom, + mContext.getString(R.string.action_drag_label_move_bottom)); + this.mActionRemove = new AccessibilityNodeInfoCompat.AccessibilityActionCompat( + R.id.action_drag_remove, + mContext.getString(R.string.action_drag_label_remove)); + } + + @Override + public void onInitializeAccessibilityNodeInfoForItem(RecyclerView.Recycler recycler, + RecyclerView.State state, View host, AccessibilityNodeInfoCompat info) { + + super.onInitializeAccessibilityNodeInfoForItem(recycler, state, host, info); + + final int itemCount = this.getItemCount(); + final int position = this.getPosition(host); + final LocaleDragCell dragCell = (LocaleDragCell) host; + + // We want the description to be something not localizable, so that any TTS engine for + // any language can handle it. And we want the position to be part of it. + // So we use something like "2, French (France)" + final String description = + (position + 1) + ", " + dragCell.getCheckbox().getContentDescription(); + info.setContentDescription(description); + + if (mAdapter.isRemoveMode()) { // We don't move things around in remove mode + return; + } + + // The order in which we add the actions is important for the circular selection menu. + // With the current order the "up" action will be (more or less) up, and "down" more + // or less down ("more or less" because we have 5 actions) + if (position > 0) { // it is not the first one + info.addAction(mActionMoveUp); + info.addAction(mActionMoveTop); + } + if (position + 1 < itemCount) { // it is not the last one + info.addAction(mActionMoveDown); + info.addAction(mActionMoveBottom); + } + if (itemCount > 1) { + info.addAction(mActionRemove); + } + } + + @Override + public boolean performAccessibilityActionForItem(RecyclerView.Recycler recycler, + RecyclerView.State state, View host, int action, Bundle args) { + + final int itemCount = this.getItemCount(); + final int position = this.getPosition(host); + + switch (action) { + case R.id.action_drag_move_up: + if (position > 0) { + mAdapter.onItemMove(position, position - 1); + return true; + } + return false; + case R.id.action_drag_move_down: + if (position + 1 < itemCount) { + mAdapter.onItemMove(position, position + 1); + return true; + } + return false; + case R.id.action_drag_move_top: + if (position != 0) { + mAdapter.onItemMove(position, 0); + return true; + } + return false; + case R.id.action_drag_move_bottom: + if (position != itemCount - 1) { + mAdapter.onItemMove(position, itemCount - 1); + return true; + } + return false; + case R.id.action_drag_remove: + if (itemCount > 1) { + mAdapter.removeItem(position); + return true; + } + return false; + default: + return super.performAccessibilityActionForItem(recycler, state, host, action, args); + } + } +} diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index 3287d393064..b95a5907be9 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -21,7 +21,6 @@ import android.app.FragmentTransaction; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.util.LocaleList; import android.view.LayoutInflater; @@ -30,7 +29,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.LinearLayout; import com.android.internal.app.LocalePicker; import com.android.internal.app.LocalePickerWithRegion; @@ -76,9 +74,8 @@ public class LocaleListEditor extends SettingsPreferenceFragment @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstState) { - View result = super.onCreateView(inflater, container, savedInstState); - LinearLayout ll = (LinearLayout) result; - View myLayout = inflater.inflate(R.layout.locale_order_list, ll); + final View result = super.onCreateView(inflater, container, savedInstState); + final View myLayout = inflater.inflate(R.layout.locale_order_list, (ViewGroup) result); getActivity().setTitle(R.string.pref_title_lang_selection); @@ -236,7 +233,7 @@ public class LocaleListEditor extends SettingsPreferenceFragment private void configureDragAndDrop(View view) { final RecyclerView list = (RecyclerView) view.findViewById(R.id.dragList); - final LinearLayoutManager llm = new LinearLayoutManager(this.getContext()); + final LocaleLinearLayoutManager llm = new LocaleLinearLayoutManager(getContext(), mAdapter); llm.setAutoMeasureEnabled(true); list.setLayoutManager(llm);