From e74a54343ce7896b5005154e8bcbc7d5f06c7808 Mon Sep 17 00:00:00 2001 From: Antonin Fouques Date: Wed, 17 Oct 2012 22:09:08 +0200 Subject: Trebuchet : Add a pref to set hotseat icon's number This adds a preference for the hotseat (Launcher main bar/dock) - Choose the number of icons on the hotseat - Choose the place of the applications drawer button by drag'n'drop - Translations in English + French This is usefull for big screen devices. You can set from 1 to 9 buttons on the hotseat. You can set the app button where you want by drag'n'drop. Default values are keeped unchanged so there is no pb with first screen tuto + no pb with default shortcuts. Demo video : https://www.dropbox.com/s/2wamj9yr1s3woxl/Trebuchet-hotseat-icons.mp4 Demo apk : https://www.dropbox.com/s/psqab2gyivcyo3d/CmoaToto%20Trebuchet.apk PatchSet 1 : initial commit PatchSet 2 : coding style PatchSet 3 : - Remove prefs for tablet - AllApps Button move by Drag'n'Drop (instead of pref) PatchSet 4 : searchbar & deletebar don't dis/appear while dragging AllApps button) PatchSet 5 : dropOnFlingToDeleteTarget disabled for AllApps button PatchSet 6 : - Fix shortcuts errors in database - Set docks pref disabled for large screen programmatically - Fix english strings/french trads Change-Id: I21f6a4610ed16c8780ccf6e2acffcf6e07511457 Conflicts: src/com/cyanogenmod/trebuchet/Hotseat.java src/com/cyanogenmod/trebuchet/LauncherModel.java src/com/cyanogenmod/trebuchet/Workspace.java --- res/values-fr/strings.xml | 2 + res/values/strings.xml | 2 + res/xml/preferences.xml | 11 ++++-- .../cyanogenmod/trebuchet/AllAppsButtonInfo.java | 35 +++++++++++++++++ .../cyanogenmod/trebuchet/DeleteDropTarget.java | 7 ++++ src/com/cyanogenmod/trebuchet/DragController.java | 10 +++-- src/com/cyanogenmod/trebuchet/Hotseat.java | 45 +++++++++++++++++++--- src/com/cyanogenmod/trebuchet/ItemInfo.java | 1 + src/com/cyanogenmod/trebuchet/Launcher.java | 2 +- src/com/cyanogenmod/trebuchet/LauncherModel.java | 13 +++++-- .../cyanogenmod/trebuchet/LauncherSettings.java | 5 +++ .../cyanogenmod/trebuchet/SearchDropTargetBar.java | 10 +++++ src/com/cyanogenmod/trebuchet/Workspace.java | 19 +++++++-- .../trebuchet/preference/Preferences.java | 4 ++ .../trebuchet/preference/PreferencesProvider.java | 14 ++++++- 15 files changed, 159 insertions(+), 21 deletions(-) create mode 100644 src/com/cyanogenmod/trebuchet/AllAppsButtonInfo.java diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 241e1c2..961cee4 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -172,6 +172,8 @@ Barre de Dock + Icônes du dock + Définir le nombre d\'icône du dock Icônes diff --git a/res/values/strings.xml b/res/values/strings.xml index 9e8d6f8..4ede002 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -347,6 +347,8 @@ s --> Dock + Dock icons + Choose the number of icons in the dock Icons diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 9cf8aaa..504ced6 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -115,10 +115,15 @@ - + +