diff --git a/app/src/main/java/de/markusfisch/android/pielauncher/activity/PreferencesActivity.java b/app/src/main/java/de/markusfisch/android/pielauncher/activity/PreferencesActivity.java index 786f2d2..915ce6e 100644 --- a/app/src/main/java/de/markusfisch/android/pielauncher/activity/PreferencesActivity.java +++ b/app/src/main/java/de/markusfisch/android/pielauncher/activity/PreferencesActivity.java @@ -494,10 +494,12 @@ public class PreferencesActivity extends Activity { return map; } - private static Map getCircleSwapsMenusOptions() { - Map map = new LinkedHashMap<>(); - map.put(Boolean.TRUE, R.string.circle_swaps_menus_yes); - map.put(Boolean.FALSE, R.string.circle_swaps_menus_no); + private static Map getCircleSwapsMenusOptions() { + Map map = new LinkedHashMap<>(); + map.put(Preferences.CIRCLE_SWAPS_SECONDARY_MENU, + R.string.circle_swaps_menus_yes); + map.put(Preferences.CIRCLE_SWAPS_NO, + R.string.circle_swaps_menus_no); return map; } diff --git a/app/src/main/java/de/markusfisch/android/pielauncher/preference/Preferences.java b/app/src/main/java/de/markusfisch/android/pielauncher/preference/Preferences.java index c1e749e..2601ee1 100644 --- a/app/src/main/java/de/markusfisch/android/pielauncher/preference/Preferences.java +++ b/app/src/main/java/de/markusfisch/android/pielauncher/preference/Preferences.java @@ -46,6 +46,8 @@ public class Preferences { public static final int HAPTIC_FEEDBACK_FOLLOW_SYSTEM = 0; public static final int HAPTIC_FEEDBACK_DISABLE_LAUNCH = 1; public static final int HAPTIC_FEEDBACK_DISABLE_ALL = 2; + public static final int CIRCLE_SWAPS_NO = 0; + public static final int CIRCLE_SWAPS_SECONDARY_MENU = 1; private static final String SKIP_SETUP = "skip_setup"; private static final String RADIUS = "radius"; @@ -74,7 +76,7 @@ public class Preferences { private static final String FORCE_RELAUNCH = "force_relaunch"; private static final String SHOW_DRAWER_ON_HOME = "show_drawer_on_home"; private static final String SPLIT_PIE_ENABLED = "split_pie_enabled"; - private static final String CIRCLE_SWAPS_MENUS = "circle_swaps_menus"; + private static final String CIRCLE_SWAPS_MENUS = "circle_swaps"; private final SharedPreferences preferences; private final SystemSettings systemSettings; @@ -105,7 +107,7 @@ public class Preferences { private boolean forceRelaunch = false; private boolean showDrawerOnHome = true; private boolean splitPieEnabled = false; - private boolean circleSwapsMenus = false; + private int circleSwapsMenus = CIRCLE_SWAPS_NO; public Preferences(Context context) { preferences = PreferenceManager.getDefaultSharedPreferences(context); @@ -158,7 +160,7 @@ public class Preferences { showDrawerOnHome); splitPieEnabled = preferences.getBoolean(SPLIT_PIE_ENABLED, splitPieEnabled); - circleSwapsMenus = preferences.getBoolean(CIRCLE_SWAPS_MENUS, + circleSwapsMenus = preferences.getInt(CIRCLE_SWAPS_MENUS, circleSwapsMenus); } @@ -404,11 +406,11 @@ public class Preferences { put(SPLIT_PIE_ENABLED, splitPieEnabled).apply(); } - public boolean circleSwapsMenus() { + public int circleSwapsMenus() { return circleSwapsMenus; } - public void setCircleSwapsMenus(boolean circleSwapsMenus) { + public void setCircleSwapsMenus(int circleSwapsMenus) { this.circleSwapsMenus = circleSwapsMenus; put(CIRCLE_SWAPS_MENUS, circleSwapsMenus).apply(); } @@ -440,6 +442,12 @@ public class Preferences { put(oldDarkenBackground, false).apply(); setDarkenBackground(DARKEN_BACKGROUND_HEAVY); } + + // Migrate old circle swaps setting. + String circleSwapsMenus = "circle_swaps_menus"; + if (preferences.getBoolean(circleSwapsMenus, false)) { + put(circleSwapsMenus, false); + setCircleSwapsMenus(CIRCLE_SWAPS_SECONDARY_MENU); } private int getOpenListWith() { diff --git a/app/src/main/java/de/markusfisch/android/pielauncher/widget/AppPieView.java b/app/src/main/java/de/markusfisch/android/pielauncher/widget/AppPieView.java index 9b20fb3..b8bca4f 100644 --- a/app/src/main/java/de/markusfisch/android/pielauncher/widget/AppPieView.java +++ b/app/src/main/java/de/markusfisch/android/pielauncher/widget/AppPieView.java @@ -618,7 +618,8 @@ public class AppPieView extends View { selectMenu(touch.x, touch.y); setCenter(touch.x, touch.y); } else { - if (prefs.circleSwapsMenus()) { + if (prefs.circleSwapsMenus() != + Preferences.CIRCLE_SWAPS_NO) { pieMenu.icons = menuPrimary; } // Keep center for interrupted touches. @@ -1434,10 +1435,8 @@ public class AppPieView extends View { } private void onCircle() { - if (!prefs.circleSwapsMenus()) { - return; - } - if (menuSecondary.isEmpty()) { + if (prefs.circleSwapsMenus() == Preferences.CIRCLE_SWAPS_NO || + menuSecondary.isEmpty()) { return; } swapMenus(); diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 256dfea..c2cd512 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -84,7 +84,7 @@ Ja Nein (Standard) Umkreisen wechselt Menüs - Ja + Sekundäres Menü Nein (Standard) Langes Drücken Fügt App zum Menu hinzu (Standard) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f6d5a14..3a4ea4c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -84,7 +84,7 @@ Oui Non (par défaut) Entourer permute les menus - Oui + Menu secondaire Non (par défaut) Appui long Lancer l\'app dans le menu (par défaut) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 60437ee..a660f52 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -84,7 +84,7 @@ Ja Nee (standaard) Omcirkelen wisselt menu\'s - Ja + Secundair menu Nee (standaard) Lang drukken Voegt app toe aan het Pie menu (standaard) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b9a5642..8ec5c0c 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -88,7 +88,7 @@ Sim Não (Padrão) Circular alterna menus - Sim + Menu secundário Não (Padrão) Toque longo Adiciona aplicativo ao menu Pie (Padrão) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2d99a84..8aee189 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -84,7 +84,7 @@ Да Нет (Стандартно) Обведение по кругу переключает меню - Да + Вторичное меню Нет (Стандартно) Длительное нажатие Добавляет приложение в меню (Стандартно) diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0e80453..4347310 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -84,7 +84,7 @@ Ja Nej (standard) Att cirkla växlar menyer - Ja + Sekundärmeny Nej (standard) Långtryckning Lägg till app i cirkelmenyn (standard) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8b869c3..e5a8b6c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -84,7 +84,7 @@ Так Ні (за замовчуванням) Обведення колом перемикає меню - Так + Вторинне меню Ні (за замовчуванням) Тривале натискання Додає додаток до меню (за замовчуванням) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 738569e..659a46f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -84,7 +84,7 @@ 是 没有 (默认) 画圈会切换菜单 - 是 + 次级菜单 没有 (默认) 长按 在菜单中添加应用程序 (默认) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4026b69..706c0bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,7 +88,7 @@ Yes No (Default) Circling swaps menus - Yes + Secondary menu No (Default) Long press Adds app to the pie menu (Default)