Restore one-click to add/remove tiles after r20 merge

Google now added the possibility to double click to move tiles
for accessibility purposes but i actually prefer the oneclick way

Change-Id: Ia44fc4e2ddc77c9cf918c2b8fea38a4e9a3c8252
Signed-off-by: Joey Huab <joey@evolution-x.org>

Author: ezio84

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

@@ -89,7 +89,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
     private int mAccessibilityFromIndex;
     private QSTileHost mHost;
     private final UiEventLogger mUiEventLogger;
-    private final AccessibilityDelegateCompat mAccessibilityDelegate;
+    //private final AccessibilityDelegateCompat mAccessibilityDelegate;
     private RecyclerView mRecyclerView;
 
     public TileAdapter(Context context, UiEventLogger uiEventLogger) {
@@ -98,7 +98,7 @@ public TileAdapter(Context context, UiEventLogger uiEventLogger) {
         mItemTouchHelper = new ItemTouchHelper(mCallbacks);
         mDecoration = new TileItemDecoration(context);
         mMinNumTiles = context.getResources().getInteger(R.integer.quick_settings_min_num_tiles);
-        mAccessibilityDelegate = new TileAdapterDelegate();
+        //mAccessibilityDelegate = new TileAdapterDelegate();
     }
 
     @Override
@@ -317,22 +317,27 @@ public void onClick(View v) {
 
         holder.mTileView.handleStateChanged(info.state);
         holder.mTileView.setShowAppLabel(position > mEditIndex && !info.isSystem);
-        holder.mTileView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+        /*holder.mTileView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
         holder.mTileView.setClickable(true);
         holder.mTileView.setOnClickListener(null);
         holder.mTileView.setFocusable(true);
-        holder.mTileView.setFocusableInTouchMode(true);
-
-        if (mAccessibilityAction == ACTION_NONE && selectable) {
-            holder.mTileView.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    move(holder.getAdapterPosition(), mEditIndex /*, notify*/);
+        holder.mTileView.setFocusableInTouchMode(true);*/
+
+        holder.mTileView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                int position = holder.getLayoutPosition();
+                if (position < mEditIndex) {
+                    if (canRemoveTiles()) {
+                        move(position, mEditIndex);
+                    }
+                } else {
+                    move(position, mEditIndex);
                 }
-            });
-        }
+            }
+        });
 
-        if (mAccessibilityAction != ACTION_NONE) {
+        /*if (mAccessibilityAction != ACTION_NONE) {
             holder.mTileView.setClickable(selectable);
             holder.mTileView.setFocusable(selectable);
             holder.mTileView.setFocusableInTouchMode(selectable);
@@ -354,7 +359,7 @@ public void onClick(View v) {
         }
         if (position == mFocusIndex) {
             focusOnHolder(holder);
-        }
+        }*/
     }
 
     private void focusOnHolder(Holder holder) {
@@ -511,7 +516,7 @@ public Holder(View itemView) {
                 mTileView.setBackground(null);
                 mTileView.getIcon().disableAnimation();
                 mTileView.setTag(this);
-                ViewCompat.setAccessibilityDelegate(mTileView, mAccessibilityDelegate);
+                //ViewCompat.setAccessibilityDelegate(mTileView, mAccessibilityDelegate);
             }
         }