adding quick-key groups ordering logic. Issue #390

39 files changed, 231 insertions, 130 deletions

diff --git a/src/main/java/com/anysoftkeyboard/quicktextkeys/QuickTextKeyFactory.java b/src/main/java/com/anysoftkeyboard/quicktextkeys/QuickTextKeyFactory.java
index 144f6a4c7..b736098e1 100644
--- a/src/main/java/com/anysoftkeyboard/quicktextkeys/QuickTextKeyFactory.java
+++ b/src/main/java/com/anysoftkeyboard/quicktextkeys/QuickTextKeyFactory.java
@@ -16,11 +16,10 @@
 
 package com.anysoftkeyboard.quicktextkeys;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.preference.PreferenceManager;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 
 import com.anysoftkeyboard.addons.AddOnsFactory;
@@ -28,8 +27,7 @@ import com.menny.android.anysoftkeyboard.R;
 
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.List;
 
 public class QuickTextKeyFactory extends AddOnsFactory<QuickTextKey> {
 
@@ -55,54 +53,40 @@ public class QuickTextKeyFactory extends AddOnsFactory<QuickTextKey> {
 	}
 
 	public static QuickTextKey getCurrentQuickTextKey(Context context) {
-		return getAllEnabledQuickKeys(context).get(0);
+		return getOrderedEnabledQuickKeys(context).get(0);
 	}
 
 	public static ArrayList<QuickTextKey> getAllAvailableQuickKeys(Context applicationContext) {
 		return msInstance.getAllAddOns(applicationContext);
 	}
 
-	public static ArrayList<QuickTextKey> getAllEnabledQuickKeys(Context applicationContext) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-			return getAllEnabledQuickKeysOrdered(applicationContext);
-		} else {
-			ArrayList<QuickTextKey> allKeys = getAllAvailableQuickKeys(applicationContext);
-			QuickTextKey activeKey = getEnabledQuickKeyForLegacy(applicationContext);
-			allKeys.remove(activeKey);
-			allKeys.add(0, activeKey);
-			return allKeys;
-		}
-	}
-
-	private static QuickTextKey getEnabledQuickKeyForLegacy(Context applicationContext) {
-		ArrayList<QuickTextKey> quickTextKeys = msInstance.getAllAddOns(applicationContext);
-
+	public static void storeOrderedEnabledQuickKeys(Context applicationContext, ArrayList<QuickTextKey> orderedKeys) {
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext);
-		String settingKey = applicationContext.getString(R.string.settings_key_active_quick_text_key);
-
-		String activeQuickKey = sharedPreferences.getString(settingKey, quickTextKeys.get(0).getId());
+		String settingKey = applicationContext.getString(R.string.settings_key_ordered_active_quick_text_keys);
 
-		for (QuickTextKey key : quickTextKeys) {
-			if (key.getId().equals(activeQuickKey)) return key;
+		List<String> quickKeyIdOrder = new ArrayList<>(orderedKeys.size());
+		for (QuickTextKey key : orderedKeys) {
+			quickKeyIdOrder.add(key.getId());
 		}
-
-		return quickTextKeys.get(0);
+		SharedPreferences.Editor editor = sharedPreferences.edit();
+		editor.putString(settingKey, TextUtils.join(",", quickKeyIdOrder)).commit();
 	}
 
-	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-	private static ArrayList<QuickTextKey> getAllEnabledQuickKeysOrdered(Context applicationContext) {
+	public static ArrayList<QuickTextKey> getOrderedEnabledQuickKeys(Context applicationContext) {
 		ArrayList<QuickTextKey> quickTextKeys = msInstance.getAllAddOns(applicationContext);
 
 		//now, reading the ordered array of active keys
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext);
 		String settingKey = applicationContext.getString(R.string.settings_key_ordered_active_quick_text_keys);
 
-		Set<String> defaultOrder = new LinkedHashSet<>(quickTextKeys.size());
-		for (QuickTextKey key : quickTextKeys) defaultOrder.add(key.getId());
-
-		Set<String> quickKeyIdsOrder = sharedPreferences.getStringSet(settingKey, defaultOrder);
+		List<String> quickKeyIdDefaultOrder = new ArrayList<>(quickTextKeys.size());
+		for (QuickTextKey key : quickTextKeys) {
+			quickKeyIdDefaultOrder.add(key.getId());
+		}
+		String quickKeyIdsOrderValue = sharedPreferences.getString(settingKey, TextUtils.join(",", quickKeyIdDefaultOrder));
+		String[] quickKeyIdsOrder = TextUtils.split(quickKeyIdsOrderValue, ",");
 
-		ArrayList<QuickTextKey> orderedQuickTextKeys = new ArrayList<>(quickKeyIdsOrder.size());
+		ArrayList<QuickTextKey> orderedQuickTextKeys = new ArrayList<>(quickKeyIdsOrder.length);
 		for (String keyId : quickKeyIdsOrder) {
 			Iterator<QuickTextKey> iterator = quickTextKeys.iterator();
 			while (iterator.hasNext()) {
diff --git a/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/FrameKeyboardViewClickListener.java b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/FrameKeyboardViewClickListener.java
index 30c572c4d..6161b8c84 100644
--- a/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/FrameKeyboardViewClickListener.java
+++ b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/FrameKeyboardViewClickListener.java
@@ -1,6 +1,5 @@
 package com.anysoftkeyboard.quicktextkeys.ui;
 
-import android.view.KeyEvent;
 import android.view.View;
 
 import com.anysoftkeyboard.api.KeyCodes;
diff --git a/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysOrderedListPreference.java b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysOrderedListPreference.java
new file mode 100644
index 000000000..d644de81a
--- /dev/null
+++ b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysOrderedListPreference.java
@@ -0,0 +1,144 @@
+package com.anysoftkeyboard.quicktextkeys.ui;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.preference.DialogPreference;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.anysoftkeyboard.quicktextkeys.QuickTextKey;
+import com.anysoftkeyboard.quicktextkeys.QuickTextKeyFactory;
+import com.emtronics.dragsortrecycler.DragSortRecycler;
+import com.menny.android.anysoftkeyboard.R;
+
+import java.util.ArrayList;
+
+public class QuickKeysOrderedListPreference extends DialogPreference {
+	private ArrayList<QuickTextKey> mQuickKeysAddOnsToStore;
+
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	public QuickKeysOrderedListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+		setDialogLayoutResource(R.layout.ordered_list_pref);
+	}
+
+	public QuickKeysOrderedListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+		setDialogLayoutResource(R.layout.ordered_list_pref);
+	}
+
+	public QuickKeysOrderedListPreference(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		setDialogLayoutResource(R.layout.ordered_list_pref);
+	}
+
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	public QuickKeysOrderedListPreference(Context context) {
+		super(context);
+		setDialogLayoutResource(R.layout.ordered_list_pref);
+	}
+
+	@Override
+	protected void onBindDialogView(@NonNull View view) {
+		super.onBindDialogView(view);
+		mQuickKeysAddOnsToStore = QuickTextKeyFactory.getOrderedEnabledQuickKeys(getContext());
+		RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
+		recyclerView.setHasFixedSize(true);
+		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		recyclerView.setAdapter(new Adapter());
+
+		recyclerView.setItemAnimator(null);
+
+		DragSortRecycler dragSortRecycler = new DragSortRecycler();
+		dragSortRecycler.setViewHandleId(R.id.orderedListSlider);
+
+		dragSortRecycler.setOnItemMovedListener(new DragSortRecycler.OnItemMovedListener() {
+			@Override
+			public void onItemMoved(RecyclerView rv, int from, int to) {
+				QuickTextKey temp = mQuickKeysAddOnsToStore.remove(from);
+				mQuickKeysAddOnsToStore.add(to, temp);
+				rv.getAdapter().notifyItemMoved(from, to);
+			}
+		});
+
+		recyclerView.addItemDecoration(dragSortRecycler);
+		recyclerView.addOnItemTouchListener(dragSortRecycler);
+		recyclerView.setOnScrollListener(dragSortRecycler.getScrollListener());
+	}
+
+	@Override
+	protected void onDialogClosed(boolean positiveResult) {
+		if (positiveResult) {
+			QuickTextKeyFactory.storeOrderedEnabledQuickKeys(getContext(), mQuickKeysAddOnsToStore);
+		}
+		super.onDialogClosed(positiveResult);
+	}
+
+	protected boolean persistString(String value) {
+		if (shouldPersist()) {
+			String currentValue = getPersistString();
+			// Shouldn't store null
+			if (currentValue.equals(value)) {
+				// It's already there, so the same as persisting
+				return true;
+			}
+
+			SharedPreferences.Editor editor = getSharedPreferences().edit();
+			editor.putString(getKey(), value);
+			editor.commit();
+
+			notifyChanged();
+
+			return true;
+		}
+		return false;
+	}
+
+	protected String getPersistString() {
+		return getSharedPreferences().getString(getKey(), "");
+	}
+
+	private static class OrderedListViewHolder extends RecyclerView.ViewHolder {
+		public final TextView titleView;
+		public final TextView subtitleVew;
+
+		public OrderedListViewHolder(View itemView) {
+			super(itemView);
+			titleView = (TextView) itemView.findViewById(R.id.orderedListTitle);
+			subtitleVew = (TextView) itemView.findViewById(R.id.orderedListSubTitle);
+		}
+	}
+
+	private class Adapter extends RecyclerView.Adapter<OrderedListViewHolder> {
+		private final LayoutInflater mLayoutInflater;
+
+		Adapter() {
+			mLayoutInflater = LayoutInflater.from(getContext());
+		}
+
+		@Override
+		public OrderedListViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+			return new OrderedListViewHolder(mLayoutInflater.inflate(R.layout.ordered_list_item, viewGroup, false));
+		}
+
+		@Override
+		public void onBindViewHolder(OrderedListViewHolder viewHolder, int position) {
+			QuickTextKey value = mQuickKeysAddOnsToStore.get(position);
+			viewHolder.titleView.setText(value.getName());
+			viewHolder.subtitleVew.setText(value.getDescription());
+		}
+
+		@Override
+		public int getItemCount() {
+			return mQuickKeysAddOnsToStore.size();
+		}
+	}
+}
diff --git a/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickTextViewFactory.java b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickTextViewFactory.java
index 122fb7a40..099eaaff0 100644
--- a/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickTextViewFactory.java
+++ b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickTextViewFactory.java
@@ -62,7 +62,7 @@ public class QuickTextViewFactory {
 		rootView.findViewById(R.id.quick_keys_popup_close).setOnClickListener(frameKeyboardViewClickListener);
 		rootView.findViewById(R.id.quick_keys_popup_backspace).setOnClickListener(frameKeyboardViewClickListener);
 		rootView.findViewById(R.id.quick_keys_popup_return).setOnClickListener(frameKeyboardViewClickListener);
-		ArrayList<QuickTextKey> list = QuickTextKeyFactory.getAllEnabledQuickKeys(context);
+		ArrayList<QuickTextKey> list = QuickTextKeyFactory.getOrderedEnabledQuickKeys(context);
 		AnyPopupKeyboard[] keyboards = new AnyPopupKeyboard[list.size()];
 		for (int keyboardIndex=0; keyboardIndex<list.size(); keyboardIndex++) {
 			QuickTextKey key = list.get(keyboardIndex);
diff --git a/src/main/java/com/anysoftkeyboard/ui/settings/AdditionalUiSettingsFragment.java b/src/main/java/com/anysoftkeyboard/ui/settings/AdditionalUiSettingsFragment.java
index 7b016df4a..74ca65326 100644
--- a/src/main/java/com/anysoftkeyboard/ui/settings/AdditionalUiSettingsFragment.java
+++ b/src/main/java/com/anysoftkeyboard/ui/settings/AdditionalUiSettingsFragment.java
@@ -61,11 +61,6 @@ public class AdditionalUiSettingsFragment extends PreferenceFragment implements
         AddOnListPreference.populateAddOnListPreference(extKeyboard,
                 KeyboardExtensionFactory.getAllAvailableExtensions(appContext, KeyboardExtension.TYPE_EXTENSION),
                 KeyboardExtensionFactory.getCurrentKeyboardExtension(appContext, KeyboardExtension.TYPE_EXTENSION));
-
-        AddOnListPreference quickTextKey = (AddOnListPreference) findPreference(getString(R.string.settings_key_active_quick_text_key));
-        AddOnListPreference.populateAddOnListPreference(quickTextKey,
-                QuickTextKeyFactory.getAllAvailableQuickKeys(appContext),
-                QuickTextKeyFactory.getCurrentQuickTextKey(appContext));
     }
 
     @Override
diff --git a/src/main/java/com/anysoftkeyboard/ui/settings/EffectsSettingsFragment.java b/src/main/java/com/anysoftkeyboard/ui/settings/EffectsSettingsFragment.java
index b5ee4a8cf..ec9c3a4e0 100644
--- a/src/main/java/com/anysoftkeyboard/ui/settings/EffectsSettingsFragment.java
+++ b/src/main/java/com/anysoftkeyboard/ui/settings/EffectsSettingsFragment.java
@@ -17,7 +17,6 @@
 
 package com.anysoftkeyboard.ui.settings;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.preference.PreferenceFragment;
 
diff --git a/src/main/java/com/emtronics/dragsortrecycler/DragSortRecycler.java b/src/main/java/com/emtronics/dragsortrecycler/DragSortRecycler.java
index 713349c5b..d257b63c4 100644
--- a/src/main/java/com/emtronics/dragsortrecycler/DragSortRecycler.java
+++ b/src/main/java/com/emtronics/dragsortrecycler/DragSortRecycler.java
@@ -75,7 +75,7 @@ public class DragSortRecycler extends RecyclerView.ItemDecoration implements Rec
 
 	public interface OnItemMovedListener
 	{
-		public void onItemMoved(int from, int to);
+		public void onItemMoved(RecyclerView rv, int from, int to);
 	}
 
 	public interface OnDragStateChangedListener {
@@ -354,7 +354,7 @@ public class DragSortRecycler extends RecyclerView.ItemDecoration implements Rec
 			{
 				int newPos = getNewPostion(rv);
 				if (moveInterface != null)
-					moveInterface.onItemMoved(selectedDragItemPos, newPos);
+					moveInterface.onItemMoved(rv, selectedDragItemPos, newPos);
 			}
 
 			setIsDragging(false);
diff --git a/src/main/res/drawable-hdpi/ic_slider_icon.png b/src/main/res/drawable-hdpi/ic_slider_icon.png
new file mode 100755
index 000000000..d597ae6f4
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_slider_icon.png
diff --git a/src/main/res/drawable-mdpi/ic_slider_icon.png b/src/main/res/drawable-mdpi/ic_slider_icon.png
new file mode 100755
index 000000000..383deaa8e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_slider_icon.png
diff --git a/src/main/res/drawable-xhdpi/ic_slider_icon.png b/src/main/res/drawable-xhdpi/ic_slider_icon.png
new file mode 100755
index 000000000..7e1641031
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_slider_icon.png
diff --git a/src/main/res/drawable-xxhdpi/ic_slider_icon.png b/src/main/res/drawable-xxhdpi/ic_slider_icon.png
new file mode 100755
index 000000000..7f193d27d
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_slider_icon.png
diff --git a/src/main/res/layout/ordered_list_item.xml b/src/main/res/layout/ordered_list_item.xml
new file mode 100644
index 000000000..31bc60dc5
--- /dev/null
+++ b/src/main/res/layout/ordered_list_item.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="?android:listPreferredItemHeight">
+
+    <ImageView
+        android:id="@+id/orderedListSlider"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_slider_icon"
+        android:layout_centerVertical="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"/>
+
+    <TextView
+        android:id="@+id/orderedListTitle"
+        style="@style/Ask.Text.Title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/orderedListSlider"
+        android:layout_toEndOf="@id/orderedListSlider"
+        android:layout_alignParentTop="true"/>
+
+    <TextView
+        android:id="@+id/orderedListSubTitle"
+        style="@style/Ask.Text.SubTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/orderedListSlider"
+        android:layout_toEndOf="@id/orderedListSlider"
+        android:layout_alignParentBottom="true"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/ordered_list_pref.xml b/src/main/res/layout/ordered_list_pref.xml
new file mode 100644
index 000000000..3679ba2f4
--- /dev/null
+++ b/src/main/res/layout/ordered_list_pref.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:scrollbars="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 14bb45bd5..886545b56 100755
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -327,9 +327,6 @@
   <string name="selected_add_on_summary">الآن يستخدم</string>
   <string name="additional_addons_group">إضافات إضافية</string>
   <string name="quick_text_keys_group">مفاتيح النص السريع</string>
-  <string name="quick_text_key_active">مفتاح النص السريع النشط</string>
-  <string name="quick_text_key_dialog_title">مفتاح الإختيار</string>
-  <string name="quick_text_key_summary">تم اختيار زر النص السريع:</string>
   <string name="extension_keyboards_group">لوحات مفاتيح موسعة</string>
   <string name="extension_keyboards_summary">إختر الصفوف العلوية والسفلية أو لوحة مفاتيح موسعة</string>
   <string name="top_generic_row_group">الصف العلوي المشترك</string>
diff --git a/src/main/res/values-be/strings.xml b/src/main/res/values-be/strings.xml
index 20cf2e342..76aaefb1f 100644
--- a/src/main/res/values-be/strings.xml
+++ b/src/main/res/values-be/strings.xml
@@ -142,7 +142,6 @@
     <string name="symbols_keyboard">Сымбалы</string>
     <string name="eng_keyboard">Ангельская</string>
     <string name="eng_keyboard_qwertywithsymbols">Ангельская мова з сымбалямі</string>
-    <string name="quick_text_key_dialog_title">Клявіша выбару</string>
     <string name="extension_keyboard_dialog_title">Абраць клавіятуру</string>
     <string name="extension_keyboard_list_title">Абраць клавіятуру</string>
     <string name="keyboard_theme_group">Тэмы клавіятуры</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index caa221c5b..9858bae73 100755
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -221,9 +221,6 @@
   <string name="selected_add_on_summary">В момента се ползва \'<xliff:g id="addOnName">%s</xliff:g>\'</string>
   <string name="additional_addons_group">Допълнителни добавки</string>
   <string name="quick_text_keys_group">Клавиш за бързи символи</string>
-  <string name="quick_text_key_active">Активен клавиш за бързи символи</string>
-  <string name="quick_text_key_dialog_title">Изберете клавиш за бързи символи</string>
-  <string name="quick_text_key_summary">Текущ клавиш за бързи символи: %s</string>
   <string name="top_generic_row_group">Избран вид на горния ред</string>
   <string name="top_generic_row_summary">Избран вид на горния ред: %s</string>
   <string name="bottom_generic_row_group">Избран вид на долния ред</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 6aecd952d..09c2e9e23 100755
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -430,9 +430,6 @@
     </string>
   <string name="additional_addons_group">Complements addicionals</string>
   <string name="quick_text_keys_group">Tecla de funció especial</string>
-  <string name="quick_text_key_active">Inserció avançada</string>
-  <string name="quick_text_key_dialog_title">Trieu una opció</string>
-  <string name="quick_text_key_summary">Tecla de selecció de text ràpid: %s</string>
   <string name="extension_keyboards_group">Teclats addicioonals</string>
   <string name="extension_keyboards_summary">Selecció de la fila o l\'extensió de teclat</string>
   <string name="top_generic_row_group">Fila superior genèrica</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 76aabf5c0..31d07d6ef 100755
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -373,9 +373,6 @@
     </string>
   <string name="additional_addons_group">Další doplňky</string>
   <string name="quick_text_keys_group">Klávesy rychlého textu</string>
-  <string name="quick_text_key_active">Aktivní klávesa rychlého textu</string>
-  <string name="quick_text_key_dialog_title">Vyberte klávesu</string>
-  <string name="quick_text_key_summary">Vybraná klávesa rychlého textu: %s</string>
   <string name="extension_keyboards_group">Rozšiřující klávesnice</string>
   <string name="extension_keyboards_summary">Vyberte horní, dolní řádky nebo rozšiřující klávesnici</string>
   <string name="top_generic_row_group">Společná horní řádka</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index e79ebcaee..3b2a2e8af 100755
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -118,8 +118,6 @@
   <string name="eng_keyboard">Engelsk</string>
   <string name="additional_addons_group">Yderligere tilføjelser</string>
   <string name="quick_text_keys_group">Hurtig tekst taster</string>
-  <string name="quick_text_key_active">Aktiv hurtig tekst knap</string>
-  <string name="quick_text_key_dialog_title">Vælg knap</string>
   <string name="extension_keyboards_group">Udvidelse tastaturer</string>
   <string name="extension_keyboards_summary">Vælg top, bund rækker eller udvidelse tastatur</string>
   <string name="top_generic_row_group">Fælles top generiske række</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 752032d21..920e1cd86 100755
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -352,9 +352,6 @@
   <string name="selected_add_on_summary">Benutze nun \'<xliff:g id="addOnName">%s</xliff:g>\'</string>
   <string name="additional_addons_group">Zusätzliche Add-ons</string>
   <string name="quick_text_keys_group">Schnell Text-Tasten</string>
-  <string name="quick_text_key_active">Aktive schnelle Textschlüssel</string>
-  <string name="quick_text_key_dialog_title">Select-Taste</string>
-  <string name="quick_text_key_summary">Ausgewählte Quicktext Schlüssel: %s</string>
   <string name="extension_keyboards_group">Erweiterte Tastatur</string>
   <string name="extension_keyboards_summary">Wählen Sie die obere, untere Zeilen oder Erweiterungs tastatur</string>
   <string name="top_generic_row_group">Allgemeine oberste generische Reihe</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 563b5e08c..3af16201b 100755
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -359,9 +359,6 @@
     </string>
   <string name="additional_addons_group">Επιπλέον πρόσθετα</string>
   <string name="quick_text_keys_group">Πλήκτρο ταχείας γραφής κειμένου</string>
-  <string name="quick_text_key_active">Ενεργοποίηση πλήκτρου ταχείας γραφής</string>
-  <string name="quick_text_key_dialog_title">Επιλέξτε πλήκτρο</string>
-  <string name="quick_text_key_summary">Επιλεγμένο πλήκτρο γρήγορου κειμένου: %s</string>
   <string name="extension_keyboards_group">Επέκταση πληκτρολογίων</string>
   <string name="extension_keyboards_summary">Επιλέξτε επάνω, κάτω γραμμές ή επέκταση πληκτρολογίου</string>
   <string name="top_generic_row_group">Κοινή πάνω γενική σειρά</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 532dc31ac..ba1101635 100755
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -348,9 +348,6 @@
     </string>
   <string name="additional_addons_group">Complementos adicionales</string>
   <string name="quick_text_keys_group">Teclas de texto rápido</string>
-  <string name="quick_text_key_active">Tecla de texto rápido activa</string>
-  <string name="quick_text_key_dialog_title">Seleccione la tecla</string>
-  <string name="quick_text_key_summary">Tecla seleccionada para texto rápido: %s</string>
   <string name="extension_keyboards_group">Teclados de extensión</string>
   <string name="extension_keyboards_summary">Seleccione las filas arriba, abajo o teclado de extensión</string>
   <string name="top_generic_row_group">Fila superior genérica común</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index bb46d16f9..9624c2c59 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -231,9 +231,6 @@
     <string name="eng_keyboard_16keys">16 näppäimen Englanti</string>
     <string name="additional_addons_group">Additional add-ons</string>
     <string name="quick_text_keys_group">Pikatekstinäppäimet</string>
-    <string name="quick_text_key_active">Aktiivinen pikatekstinäppäin</string>
-    <string name="quick_text_key_dialog_title">Valitse näppäin</string>
-    <string name="quick_text_key_summary">Valitse pikatekstinäppäin, joka näkyy näppäimistöissä</string>
     <string name="extension_keyboards_group">Extension keyboards</string>
     <string name="extension_keyboards_summary">Select top, bottom rows or extension keyboard</string>
     <string name="top_generic_row_group">Common top generic row</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 5b4557ca8..0f6d42a52 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -396,9 +396,6 @@
     <string name="eng_keyboard_16keys">Clavier 16 touches en anglais</string>
     <string name="additional_addons_group">Extensions additionnelles</string>
     <string name="quick_text_keys_group">Texte rapide</string>
-    <string name="quick_text_key_active">Touche de texte rapide active</string>
-    <string name="quick_text_key_dialog_title">Sélection de la touche</string>
-    <string name="quick_text_key_summary">Sélectionner la touche de texte rapide à afficher sur les claviers</string>
     <string name="extension_keyboards_group">Extension du clavier</string>
     <string name="extension_keyboards_summary">Sélectionnez la rangée du bas, du haut ou l’extension de clavier</string>
     <string name="top_generic_row_group">Rangée du haut habituelle</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 23e0ee18e..4f1301ab6 100755
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -354,9 +354,6 @@ törlődik, teljesen lenyomva az utolsó szó</string>
     </string>
   <string name="additional_addons_group">További kiegészítők</string>
   <string name="quick_text_keys_group">Gyors gombok</string>
-  <string name="quick_text_key_active">Az aktuális gyors-szöveg gomb</string>
-  <string name="quick_text_key_dialog_title">Gomb kiválasztása</string>
-  <string name="quick_text_key_summary">Kiválasztott Gyorsszöveg-billentyű: %s</string>
   <string name="extension_keyboards_group">Kiegészítő billentyűzetek</string>
   <string name="extension_keyboards_summary">Válasszon alsó, felső sorokat és kiegészítő billentyűzetet</string>
   <string name="top_generic_row_group">Felső billentyűzet sor</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index f39eec059..03010a73f 100755
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -291,8 +291,6 @@
   <string name="eng_keyboard_16keys">16 Tasti Inglese</string>
   <string name="additional_addons_group">Ulteriori add-on</string>
   <string name="quick_text_keys_group">Tasti testo rapido</string>
-  <string name="quick_text_key_active">Attiva tasto testo rapido</string>
-  <string name="quick_text_key_dialog_title">Seleziona tasto</string>
   <string name="extension_keyboards_group">Estensione tastiere</string>
   <string name="extension_keyboards_summary">Seleziona riga superiore o inferiore o estensione della tastiera</string>
   <string name="top_generic_row_group">Riga superiore generica comune</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 3185f9a61..85c8d7151 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -258,9 +258,6 @@
   <string name="keyboard_change_locked">לא זמין</string>
   <string name="additional_addons_group">תוספים</string>
   <string name="quick_text_keys_group">לחצני טקסט מהיר</string>
-  <string name="quick_text_key_active">לחצני טקסט מהיר פעילים</string>
-  <string name="quick_text_key_dialog_title">בחר סוג</string>
-  <string name="quick_text_key_summary">כפתור טקסט מהיר בשימוש: %s</string>
   <string name="extension_keyboards_group">מקלדות הרחבה</string>
   <string name="extension_keyboards_summary">בחר הרחבות למקלדת</string>
   <string name="top_generic_row_group">שורת מקשים עליונה</string>
diff --git a/src/main/res/values-mk/strings.xml b/src/main/res/values-mk/strings.xml
index 9fb554bf8..08a13e701 100755
--- a/src/main/res/values-mk/strings.xml
+++ b/src/main/res/values-mk/strings.xml
@@ -134,7 +134,6 @@
   <string name="keyboards_group">Тастатури</string>
   <string name="eng_keyboard">Англиски</string>
   <string name="eng_keyboard_16keys">Англиски со 16</string>
-  <string name="quick_text_key_dialog_title">Изберете копче</string>
   <string name="show_tutorial_on_startup">Прикажи го ова упатство на почеток</string>
   <string name="tutorial_swipe_title">Повлечи (swipe) за промена на тастатура</string>
   <string name="tutorial_swipe_text">Тастатурата може да се смени со повлекување (swipe) преку тастатурата. Повлечи од лево кон десно за промена на абецеда, а од десно кон лево за промена на симболи.</string>
diff --git a/src/main/res/values-my/strings.xml b/src/main/res/values-my/strings.xml
index 9804c59ab..1688fde18 100755
--- a/src/main/res/values-my/strings.xml
+++ b/src/main/res/values-my/strings.xml
@@ -206,7 +206,6 @@
   <string name="keyboards_group">လက်ကွက်ပံုစံများ</string>
   <string name="eng_keyboard">အင်္ဂလိပ်</string>
   <string name="eng_keyboard_16keys">၁၆ ကီး အင်္ဂလိပ်ကီးဘုတ်</string>
-  <string name="quick_text_key_dialog_title">ခလုပ်ရွေးပါ။</string>
   <string name="keyboard_theme_dialog_title">အပြင်အဆင်ဒီဇိုင်းရွေးပါ</string>
   <string name="keyboard_theme_list_title">အပြင်အဆင်ဒီဇိုင်းရွေးပါ</string>
   <string name="extension_kbd_top_small_numbers">ဂဏန်းကွက်များ</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index e74d65c2f..7dcd2409b 100755
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -424,9 +424,6 @@ karakter, volledig indrukken verwijderd laatste woord
     </string>
   <string name="additional_addons_group">Extra add-ons</string>
   <string name="quick_text_keys_group">Snel teksttoetsen</string>
-  <string name="quick_text_key_active">Actieve snel teksttoets</string>
-  <string name="quick_text_key_dialog_title">Kies toets</string>
-  <string name="quick_text_key_summary">Geselecteerde sneltoets: %s</string>
   <string name="extension_keyboards_group">Uitbreidingstoetsenborden</string>
   <string name="extension_keyboards_summary">Kies de bovenste, onderste rij of uitbreidingstoetsenbord</string>
   <string name="top_generic_row_group">Algemene bovenste rij</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index bf40a418a..670d42ddd 100755
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -284,9 +284,6 @@
   <string name="eng_keyboard_16keys">Angielski 16 klawiszy</string>
   <string name="additional_addons_group">Dodatkowe rozszerzenia</string>
   <string name="quick_text_keys_group">Klawisze szybkiego tekstu</string>
-  <string name="quick_text_key_active">Aktywny klawisz szybkiego tekstu</string>
-  <string name="quick_text_key_dialog_title">Wybierz klawisz</string>
-  <string name="quick_text_key_summary">Wybrany klawisz szybkiego tekstu: %s</string>
   <string name="extension_keyboards_group">Klawiatury rozszerzające</string>
   <string name="extension_keyboards_summary">Wybierz górne albo dolne wiersze lub klawiaturę rozszerzającą</string>
   <string name="top_generic_row_group">Górny wiersz funkcyjny</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index a3f9c12cd..b198b826e 100755
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -380,9 +380,6 @@
     </string>
   <string name="additional_addons_group">Outras extras</string>
   <string name="quick_text_keys_group">Teclas de texto rápido</string>
-  <string name="quick_text_key_active">Tecla de texto rápido ativa</string>
-  <string name="quick_text_key_dialog_title">Escolha a tecla</string>
-  <string name="quick_text_key_summary">Tecla escolhida: %s</string>
   <string name="extension_keyboards_group">Teclados extensivos</string>
   <string name="extension_keyboards_summary">Escolha linha superior, inferior ou teclado extensivo</string>
   <string name="top_generic_row_group">Linha superior comum</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index e95ac0702..86f24d7ac 100755
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -210,8 +210,6 @@
   <string name="eng_keyboard_16keys">16 Keys English</string>
   <string name="additional_addons_group">Доп. дополнения</string>
   <string name="quick_text_keys_group">Клавиши быстрого текста</string>
-  <string name="quick_text_key_active">Текущая клавиша быстрого текста</string>
-  <string name="quick_text_key_dialog_title">Выберите клавишу</string>
   <string name="extension_keyboards_group">Доп. клавиши</string>
   <string name="extension_keyboards_summary">Выбрать верхнюю и нижнию строку и дополнительную клавиатуру</string>
   <string name="top_generic_row_group">Общий верхний ряд</string>
diff --git a/src/main/res/values-se/strings.xml b/src/main/res/values-se/strings.xml
index 11a75e358..0c5d75661 100644
--- a/src/main/res/values-se/strings.xml
+++ b/src/main/res/values-se/strings.xml
@@ -185,9 +185,6 @@
     <string name="eng_keyboard">Engelskt</string>
     <string name="eng_keyboard_16keys">16 Keys English</string>
     <string name="quick_text_keys_group">Quick text keys</string>
-    <string name="quick_text_key_active">Active quick text key</string>
-    <string name="quick_text_key_dialog_title">Select key</string>
-    <string name="quick_text_key_summary">Select quick text key to show on keyboards</string>
     <string name="show_tutorial_on_startup">Visa den här handledningen vid uppstart</string>
     <string name="tutorial_swipe_title">Dra fingret för att byta tangentbordsupplägg</string>
     <string name="tutorial_swipe_text">Tangenbordslayout kan ändras genom att dra ditt finger över tangentbordet, dra
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index af95a9637..a6ce4d172 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -149,9 +149,6 @@
     <string name="eng_keyboard">Angleška</string>
     <string name="eng_keyboard_16keys">16 Tipk Angleščina</string>
     <string name="quick_text_keys_group">Tipke hitro besedilo</string>
-    <string name="quick_text_key_active">Aktiviraj tipko hitro besedilo</string>
-    <string name="quick_text_key_dialog_title">Izberite tipko</string>
-    <string name="quick_text_key_summary">Izberite tipko hitro besedilo za prikaz na tipkovnici</string>
     <string name="keyboard_theme_list_title">Izberite temo</string>
     <string name="extension_kbd_top_small">Majhne tipke</string>
     <string name="extension_kbd_extension_numbers_symbols">Številke in simboli</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 3eb384546..555b75337 100755
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -94,7 +94,6 @@ bulamıyorum. Bu özellik cihazınızda çalışamaz, üzgünüz.</string>
   <string name="keyboards_group">Klavyeler</string>
   <string name="eng_keyboard">İngilizce</string>
   <string name="eng_keyboard_16keys">16 Tuş İngilizce</string>
-  <string name="quick_text_key_dialog_title">Tuş seç</string>
   <string name="extension_keyboard_dialog_title">Klavyeyi seçin</string>
   <string name="extension_keyboard_list_title">Klavyeyi seçin</string>
   <string name="keyboard_theme_group">Klavye Temaları</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 95dd1cec6..62230ba19 100755
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -294,9 +294,6 @@
   <string name="eng_keyboard_16keys">Англійська 16 клавіш</string>
   <string name="additional_addons_group">Додаткові застосування</string>
   <string name="quick_text_keys_group">Клавіші швидкого тексту</string>
-  <string name="quick_text_key_active">Поточна клавіша швидкого тексту</string>
-  <string name="quick_text_key_dialog_title">Виберіть клавішу</string>
-  <string name="quick_text_key_summary">Вибрана клавіша швидкого текст: %s</string>
   <string name="extension_keyboards_group">Розширення клавіатур</string>
   <string name="extension_keyboards_summary">Вибрати верхній, нижній рядок або додаткову клавіатуру</string>
   <string name="top_generic_row_group">Загальний верхній ряд</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4ecc7275b..e95b3759a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -541,9 +541,9 @@
     <string name="additional_addons_group">Additional add-ons</string>
     <!-- settings - quick text keys -->
     <string name="quick_text_keys_group">Quick text keys</string>
-    <string name="quick_text_key_active">Active quick text key</string>
-    <string name="quick_text_key_dialog_title">Select key</string>
-    <string name="quick_text_key_summary">Selected Quick Text key: %s</string>
+    <string name="quick_text_keys_order">Order of Quick Text groups</string>
+    <string name="quick_text_keys_order_dialog_title">Define groups order</string>
+    <string name="quick_text_keys_order_summary">The order in which the Quick Text groups will be shown in the popup.</string>
 
     <!-- settings - extension keyboards -->
     <string name="extension_keyboards_group">Extension keyboards</string>
diff --git a/src/main/res/xml/prefs_addtional_ui_addons_prefs.xml b/src/main/res/xml/prefs_addtional_ui_addons_prefs.xml
index 76ad0b395..f8d15fd0a 100644
--- a/src/main/res/xml/prefs_addtional_ui_addons_prefs.xml
+++ b/src/main/res/xml/prefs_addtional_ui_addons_prefs.xml
@@ -3,34 +3,34 @@
     android:key="prefs_addons_screen">
 
     <PreferenceCategory
-        android:key="bottom_row_addons_group"
-        android:title="@string/bottom_generic_row_group"
-        android:summary="@string/bottom_generic_row_group_summary">
+        android:key="top_row_addons_group"
+        android:title="@string/top_generic_row_group">
 
         <com.anysoftkeyboard.ui.settings.widget.AddOnListPreference
-            android:defaultValue="@string/settings_default_ext_kbd_bottom_row_key"
-            android:dialogTitle="@string/bottom_generic_row_dialog_title"
+            android:defaultValue="@string/settings_default_top_row_key"
+            android:dialogTitle="@string/top_generic_row_dialog_title"
             android:entries="@array/pref_list_empty_types"
             android:entryValues="@array/pref_list_empty_values"
-            android:key="@string/settings_key_ext_kbd_bottom_row_key"
+            android:key="@string/settings_key_ext_kbd_top_row_key"
             android:persistent="true"
-            android:summary="@string/bottom_generic_row_summary"
-            android:title="@string/bottom_generic_row_list_title" />
+            android:summary="@string/top_generic_row_summary"
+            android:title="@string/top_generic_row_list_title" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="top_row_addons_group"
-        android:title="@string/top_generic_row_group">
+        android:key="bottom_row_addons_group"
+        android:title="@string/bottom_generic_row_group"
+        android:summary="@string/bottom_generic_row_group_summary">
 
         <com.anysoftkeyboard.ui.settings.widget.AddOnListPreference
-            android:defaultValue="@string/settings_default_top_row_key"
-            android:dialogTitle="@string/top_generic_row_dialog_title"
+            android:defaultValue="@string/settings_default_ext_kbd_bottom_row_key"
+            android:dialogTitle="@string/bottom_generic_row_dialog_title"
             android:entries="@array/pref_list_empty_types"
             android:entryValues="@array/pref_list_empty_values"
-            android:key="@string/settings_key_ext_kbd_top_row_key"
+            android:key="@string/settings_key_ext_kbd_bottom_row_key"
             android:persistent="true"
-            android:summary="@string/top_generic_row_summary"
-            android:title="@string/top_generic_row_list_title" />
+            android:summary="@string/bottom_generic_row_summary"
+            android:title="@string/bottom_generic_row_list_title" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -52,15 +52,12 @@
         android:key="quick_key_addons_group"
         android:title="@string/quick_text_keys_group">
 
-        <com.anysoftkeyboard.ui.settings.widget.AddOnListPreference
-            android:defaultValue="@string/settings_default_quick_text_key"
-            android:dialogTitle="@string/quick_text_key_dialog_title"
-            android:entries="@array/pref_list_empty_types"
-            android:entryValues="@array/pref_list_empty_values"
+        <com.anysoftkeyboard.quicktextkeys.ui.QuickKeysOrderedListPreference
+            android:dialogTitle="@string/quick_text_keys_order_dialog_title"
             android:key="@string/settings_key_active_quick_text_key"
             android:persistent="true"
-            android:summary="@string/quick_text_key_summary"
-            android:title="@string/quick_text_key_active"/>
+            android:summary="@string/quick_text_keys_order_summary"
+            android:title="@string/quick_text_keys_order"/>
 
         <!-- putting this at the end, so the user will get some kind of context -->
         <com.anysoftkeyboard.ui.settings.widget.AddOnStoreSearchPreference