Merge "Cleanup" into cm-10.1

6 files changed, 16 insertions, 20 deletions

diff --git a/res/layout/wallpaper_chooser.xml b/res/layout/wallpaper_chooser.xml
index 4993076..62f22ee 100644
--- a/res/layout/wallpaper_chooser.xml
+++ b/res/layout/wallpaper_chooser.xml
@@ -29,7 +29,7 @@
             android:layout_alignParentBottom="true"
             android:background="@drawable/wallpaper_gallery_background">
 
-        <Gallery android:id="@+id/gallery"
+        <com.cyanogenmod.trebuchet.widget.EcoGallery android:id="@+id/gallery"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:spacing="-4dp" />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index aa45396..124c3a9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -220,8 +220,6 @@
     <string name="preferences_interface_drawer_indicator_enable_summary">Seitenindikator anzeigen</string>
     <string name="preferences_interface_drawer_indicator_fade_title">Automatisch ausblenden</string>
     <string name="preferences_interface_drawer_indicator_fade_summary">Indikator nach Seitenwechsel ausblenden</string>
-    <string name="preferences_interface_homescreen_indicator_background_title">Dock-Abtrennung anzeigen</string>
-    <string name="preferences_interface_homescreen_indicator_background_summary">Linie als Indikator-Hintergrund anzeigen</string>
 
     <!-- Dock -->
     <string name="preferences_interface_dock_title">Dock</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 241e1c2..fa7e1df 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -139,10 +139,6 @@
     <string name="preferences_interface_homescreen_general_grid_summary">Définir le nombre de rangées et de colonnes sur l\'écran d\'accueil</string>
     <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_screen_padding_vertical_title">Marge verticale</string>
-    <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Espacement supplémentaire vertical sur l\'écran d\'accueil</string>
-    <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Marge horizontale</string>
-    <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Espacement supplémentaire horizontal</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>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 981897d..a8f0d21 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -130,13 +130,6 @@
         <attr name="clingFocusedY" format="integer" />
     </declare-styleable>
 
-    <!-- HandleView specific attributes. These attributes are used to customize
-         a HandleView view in XML files. -->
-    <declare-styleable name="HandleView">
-        <!-- Orientation of the handle. -->
-        <attr name="direction" />
-    </declare-styleable>
-
     <!-- XML attributes used by default_workspace.xml -->
     <declare-styleable name="Favorite">
         <attr name="className" format="string" />
@@ -183,4 +176,17 @@
         <attr name="pickerTitle1" format="string" />
         <attr name="pickerTitle2" format="string" />
     </declare-styleable>
+
+    <declare-styleable name="EcoGallery">
+        <attr name="gravity" format="integer" />
+        <attr name="animationDuration" format="integer" />
+        <attr name="unselectedAlpha" format="float" />
+        <attr name="spacing" format="dimension" />
+    </declare-styleable>
+    <attr name="ecoGalleryStyle" format="reference" />
+
+    <declare-styleable name="CustomAbsSpinner">
+        <attr name="entries" format="reference" />
+    </declare-styleable>
+    <attr name="customAbsSpinnerStyle" format="reference" />
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 91fec67..86d2924 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -35,10 +35,6 @@
          AppsCustomize (y / x * 100%)  -->
     <integer name="config_appsCustomizeDragSlopeThreshold">150</integer>
 
-    <!-- Batch loading for loading in LauncherModel -->
-    <integer name="config_allAppsBatchLoadDelay">0</integer>
-    <integer name="config_allAppsBatchSize">0</integer>
-
 <!-- Workspace -->
     <!-- Whether or not the drop targets drop down as opposed to fade in -->
     <bool name="config_useDropTargetDownTransition">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 849b964..37a97a0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,9 +23,9 @@
     <!-- Application name -->
     <string name="application_name" translatable="false">Trebuchet</string>
     <!-- Application copyright -->
-    <string name="application_copyright">Copyright \u00A9 CyanogenMod 2012</string>
+    <string name="application_copyright">Copyright \u00A9 CyanogenMod 2013</string>
     <!-- Application version -->
-    <string name="application_version">0.2</string>
+    <string name="application_version">1.0</string>
     <!-- Accessibility-facing application name -->
     <string name="home">Home</string>
     <!-- Name for all applications running as this uid. -->