Workspace: Remove resize any widget preference

Change-Id: Ia8876584e008d359bfecc85412ea03f8d7bb450f

20 files changed, 8 insertions, 63 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1dac3c30d..8569d882f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -132,8 +132,6 @@
     <string name="preferences_interface_homescreen_general_grid_rows_title">Řádky</string>
     <string name="preferences_interface_homescreen_general_grid_columns_title">Sloupce</string>
     <string name="preferences_interface_homescreen_general_search_summary">Povolit trvalou vyhledávací lištu</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Upravit velikost widgetu</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Povolit změnu velikosti widgetů, které nepodporují změnu velikosti</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Skrýt popisky ikon</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Skrýt popisky ikon na ploše</string>
     <string name="preferences_interface_homescreen_scrolling_category">Posouvání</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0fcdc368b..cdb4527e4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -165,8 +165,6 @@
     <string name="preferences_interface_homescreen_general_stretch_screens_title">Stræk skærme</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">Udvid startskærme til at fylde størrelsen på skærmen</string>
     <string name="preferences_interface_homescreen_general_search_summary">Aktivér vedvarende søgefelt</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Ændre størrelse på enhver widget</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Tillader ændring af størrelsen på widgets, der normalt ikke kan ændres</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Skjul ikontekst</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Skjul ikontekster på startskærmene</string>
     <string name="preferences_interface_homescreen_scrolling_category">Bladring</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4829d7670..98f4a36be 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -199,8 +199,6 @@
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">Seiten bildschirmfüllend ausdehnen</string>
     <string name="preferences_interface_homescreen_general_search_title">Suchleiste</string>
     <string name="preferences_interface_homescreen_general_search_summary">Dauerhafte Anzeige der Suchleiste</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Größe aller Widgets anpassbar</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Größe statischer Widgets auch anpassbar machen</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Beschriftung nicht anzeigen</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Beschriftung unterhalb der Icons nicht anzeigen</string>
     <string name="preferences_interface_homescreen_scrolling_category">Scrollen</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1ab955a04..2fafa5560 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -142,8 +142,6 @@
     <string name="preferences_interface_homescreen_general_grid_columns_title">Columnas</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_title">Extender pantallas</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">Extender las pantallas de inicio para ocupar toda la pantalla</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Redimensionar widgets</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permitir redimensionar los widgets que normalmente no son redimensionables</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Ocultar etiquetas</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Ocultar las etiquetas de los iconos de la pantalla de inicio</string>
     <string name="preferences_interface_homescreen_scrolling_category">Desplazamiento</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8ee331830..74a87befe 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -128,8 +128,6 @@
     <string name="preferences_interface_homescreen_general_grid_rows_title">Rivit</string>
     <string name="preferences_interface_homescreen_general_grid_columns_title">Sarakkeet</string>
     <string name="preferences_interface_homescreen_general_search_summary">Ota pysyvä hakupalkki käyttöön</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Vapaa widgetin koko</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Sallii widgetien koon muuttamisen vaikka koon muuttaminen olisi estetty</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Piilota kuvakkeiden tekstit</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Piilota kuvakkeiden tekstit kotinäytöllä</string>
     <string name="preferences_interface_homescreen_scrolling_category">Selaaminen</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cc557aaa8..a677c7747 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -140,8 +140,6 @@
     <string name="preferences_interface_homescreen_general_grid_rows_title">Rangées</string>
     <string name="preferences_interface_homescreen_general_grid_columns_title">Colonnes</string>
     <string name="preferences_interface_homescreen_general_search_summary">Activer la barre de recherche persistante</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Redimensionner tous les widgets</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permet de redimensionner les widgets qui normalement n\'en sont pas capables</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Sans libellés</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Cacher le libellé des icônes de l\'écran d\'accueil</string>
     <string name="preferences_interface_homescreen_scrolling_category">Défilement</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a349fac76..c4870716f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -163,8 +163,6 @@
     <string name="preferences_interface_homescreen_general_stretch_screens_title">Képernyő kiterjesztése</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">Kezdőképernyők kiterjesztése a kijelző kitöltéséhez</string>
     <string name="preferences_interface_homescreen_general_search_summary">Állandó keresősáv engedélyezése</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Átméretezhető modulok</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Modulok átméretezésének engedélyezése a kezdőképernyőn</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Ikon feliratok elrejtése</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Elrejti a kezdőképernyőn lévő ikonok neveit</string>
     <string name="preferences_interface_homescreen_scrolling_category">Kinézet</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e5f7e0192..368358f1b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -133,8 +133,6 @@
     <string name="preferences_interface_homescreen_general_grid_columns_title">Colonne</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_title">Allunga schermate</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">Espandi le schermate per riempire tutto lo schermo</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Ridimensiona widget</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permette di ridimensionare tutti i widget, anche quelli ai quali normalmente non è consentito</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Nascondi etichette</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Nascondi le etichette delle icone nella Home</string>
     <string name="preferences_interface_homescreen_scrolling_category">Scorrimento</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 1794fd915..4b0bc4993 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -151,8 +151,6 @@
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">画面のサイズいっぱいにホーム画面を拡張する</string>
     <string name="preferences_interface_homescreen_general_search_title">サーチバー</string>
     <string name="preferences_interface_homescreen_general_search_summary">常設のサーチバーを有効にする</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">ウィジェットのリサイズ</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">通常リサイズできないウィジェットを含め全てのウィジェットをリサイズ可能にする</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">アイコンラベルを隠す</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">ホーム画面のアイコンラベルを隠す</string>
     <string name="preferences_interface_homescreen_scrolling_category">スクロール</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ff4ed41d9..c126ebf02 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -155,8 +155,6 @@
     <string name="preferences_interface_homescreen_general_grid_columns_title">Kolommen</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_title">Schermen uitrekken</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">Startschermen uitrekken om het scherm te vullen</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Widgetgrootte altijd wijzigen</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Toestaan grootte van alle widgets te veranderen</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Labels verbergen</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Namen onder iconen verbergen</string>
 
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d1b7d91ca..f1bd4aea2 100755
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -127,8 +127,6 @@
     <string name="preferences_interface_homescreen_general_grid_rows_title">Linhas</string>
     <string name="preferences_interface_homescreen_general_grid_columns_title">Colunas</string>
     <string name="preferences_interface_homescreen_general_search_summary">Ativar Barra de Pesquisa persistente</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Redimensionar Widgets</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permite redimensionamento de Widgets que normalmente não são redimensionáveis</string>
     <string name="preferences_interface_homescreen_general_screens_title">Telas Iniciais</string>
     <string name="preferences_interface_homescreen_general_screens_summary">Número de telas na Tela Inicial</string>
     <string name="preferences_interface_homescreen_general_default_screen_title">Tela Padrão</string>
@@ -202,4 +200,4 @@
     <string name="preferences_interface_dock_enabled_summary">Exibir o dock embaixo da tela inicial</string>
     <string name="preferences_interface_dock_icon_scale_title">Escala do ícone</string>
     <string name="preferences_interface_dock_icon_scale_summary">Escala do ícone no dock</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4ed97c886..fca4a3f3f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -141,8 +141,6 @@
     <string name="preferences_interface_homescreen_general_grid_columns_title">"Coloane"</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_title">"Întindeţi ecranele"</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">"Extinde ecranele pentru a umple dimensiunea ecranului dispozitivului"</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">"Redimensionarea orice widget"</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">"Permite redimensionarea obiectelor widget care în mod normal nu sunt redimensionabile"</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">"Ascundeți etichetele pictogramelor"</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">"Ascundeți etichetele pictogramelor pe ecranul de pornire"</string>
     <string name="preferences_interface_homescreen_scrolling_category">"Defilare"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f8df10c89..82f2fb123 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -148,8 +148,6 @@
     <string name="preferences_interface_homescreen_general_stretch_screens_title">Эластичные экраны</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">Расширять домашние экраны до заполнения размера экрана</string>
     <string name="preferences_interface_homescreen_general_search_summary">Включить неисчезающую строку поиска Google</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Изм. разм. любого виджета</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Позволяет изменять размеры виджетов, которые изначально неизменяемые</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Прятать подписи иконок</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Прятать подписи иконок на рабочих столах</string>
     <string name="preferences_interface_homescreen_scrolling_category">ПРОКРУТКА</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 2725f2715..41c1526ce 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -132,8 +132,6 @@
     <string name="preferences_interface_homescreen_general_grid_columns_title">Sütunlar</string>
     <string name="preferences_interface_homescreen_general_search_title">Arama çubuğu</string>
     <string name="preferences_interface_homescreen_general_search_summary">Arama çubuğunu sürekli göster</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Bütün araçları boyutlandır</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Boyutlandırmayı desteklemese bile araçları yine de boyutlandır</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Simge etiketlerini gizle</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Ana ekrandaki simge etiketlerini gizle</string>
     <string name="preferences_interface_homescreen_scrolling_category">Kaydırma</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5c1940c22..0dc5194d0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -161,8 +161,6 @@
     <string name="preferences_interface_homescreen_general_grid_columns_title">列</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_title">拉长屏幕</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">扩展主屏幕为填充屏幕大小</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">调整任何小部件的大小</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">允许小部件的大小调整</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">隐藏图标标签</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">隐藏在主屏幕上图标的标签</string>
     <string name="preferences_interface_homescreen_scrolling_category">滚动</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 70f411249..8c16ad11f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -332,8 +332,6 @@ s -->
     <string name="preferences_interface_homescreen_general_grid_columns_title">Columns</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_title">Stretch screens</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_summary">Expand homescreens to fill the size of display</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_title">Resize any widget</string>
-    <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Allow resizing of widgets that normally aren\'t resizeable</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Hide icon labels</string>
     <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Hide homescreen icon labels</string>
     <string name="preferences_interface_homescreen_scrolling_category">Scrolling</string>
diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml
index 2df79cf22..af64dba6e 100644
--- a/res/xml/preferences_homescreen.xml
+++ b/res/xml/preferences_homescreen.xml
@@ -50,9 +50,6 @@
             android:title="@string/preferences_interface_homescreen_general_search_title"
             android:summary="@string/preferences_interface_homescreen_general_search_summary"
             android:defaultValue="true" />
-        <CheckBoxPreference android:key="ui_homescreen_general_resize_any_widget"
-            android:title="@string/preferences_interface_homescreen_general_resize_any_widget_title"
-            android:summary="@string/preferences_interface_homescreen_general_resize_any_widget_summary" />
         <CheckBoxPreference android:key="ui_homescreen_general_hide_icon_labels"
             android:title="@string/preferences_interface_homescreen_general_hide_icon_labels_title"
             android:summary="@string/preferences_interface_homescreen_general_hide_icon_labels_summary" />
diff --git a/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java b/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java
index 0493f7697..5b868c179 100644
--- a/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java
+++ b/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java
@@ -13,8 +13,6 @@ import android.view.Gravity;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.cyanogenmod.trebuchet.preference.PreferencesProvider;
-
 public class AppWidgetResizeFrame extends FrameLayout {
     private LauncherAppWidgetHostView mWidgetView;
     private CellLayout mCellLayout;
@@ -120,19 +118,9 @@ public class AppWidgetResizeFrame extends FrameLayout {
         mWidgetPaddingBottom = p.bottom;
 
         // Resize any widget
-        if (PreferencesProvider.Interface.Homescreen.getResizeAnyWidget()) {
-            mResizeMode = AppWidgetProviderInfo.RESIZE_BOTH;
-            mMinHSpan = 1;
-            mMinVSpan = 1;
-        }
-
-        if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) {
-            mTopHandle.setVisibility(GONE);
-            mBottomHandle.setVisibility(GONE);
-        } else if (mResizeMode == AppWidgetProviderInfo.RESIZE_VERTICAL) {
-            mLeftHandle.setVisibility(GONE);
-            mRightHandle.setVisibility(GONE);
-        }
+        mResizeMode = AppWidgetProviderInfo.RESIZE_BOTH;
+        mMinHSpan = 1;
+        mMinVSpan = 1;
 
         final float density = mLauncher.getResources().getDisplayMetrics().density;
         mBackgroundPadding = (int) Math.ceil(density * BACKGROUND_PADDING);
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index b78b44899..e4e19dabf 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -389,7 +389,6 @@ public class Workspace extends PagedView
         mStretchScreens = PreferencesProvider.Interface.Homescreen.getStretchScreens();
         mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar();
         mShowHotseat = PreferencesProvider.Interface.Dock.getShowDock();
-        mResizeAnyWidget = PreferencesProvider.Interface.Homescreen.getResizeAnyWidget();
         mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels();
         mTransitionEffect = PreferencesProvider.Interface.Homescreen.Scrolling.getTransitionEffect(
                 res.getString(R.string.config_workspaceDefaultTransitionEffect));
@@ -2908,16 +2907,13 @@ public class Workspace extends PagedView
                         // in its final location
 
                         final LauncherAppWidgetHostView hostView = (LauncherAppWidgetHostView) cell;
-                        AppWidgetProviderInfo pinfo = hostView.getAppWidgetInfo();
-                        if (pinfo != null &&
-                                pinfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE || mResizeAnyWidget) {
-                            final Runnable addResizeFrame = new Runnable() {
+                        final Runnable addResizeFrame = new Runnable() {
                                 public void run() {
                                     DragLayer dragLayer = mLauncher.getDragLayer();
                                     dragLayer.addResizeFrame(hostView, cellLayout);
                                 }
-                            };
-                            resizeRunnable = (new Runnable() {
+                        };
+                        resizeRunnable = new Runnable() {
                                 public void run() {
                                     if (!isPageMoving()) {
                                         addResizeFrame.run();
@@ -2925,8 +2921,7 @@ public class Workspace extends PagedView
                                         mDelayedResizeRunnable = addResizeFrame;
                                     }
                                 }
-                            });
-                        }
+                        };
                     }
 
                     LauncherModel.moveItemInDatabase(mLauncher, info, container, screen, lp.cellX,
diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
index a20d812f4..045a9df06 100644
--- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
+++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
@@ -82,9 +82,6 @@ public final class PreferencesProvider {
             public static boolean getShowSearchBar() {
                 return getBoolean("ui_homescreen_general_search", true);
             }
-            public static boolean getResizeAnyWidget() {
-                return getBoolean("ui_homescreen_general_resize_any_widget", false);
-            }
             public static boolean getHideIconLabels() {
                 return getBoolean("ui_homescreen_general_hide_icon_labels", false);
             }