Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_pack…

…ages_apps_Trebuchet into cm-10.1
CyanogenMod · Dec 27, 2012 · 6681b55 · 6681b55
2 parents 91f7ac0 + 477017c
commit 6681b55
Show file tree

Hide file tree

Showing 23 changed files with 282 additions and 187 deletions.
diff --git a/proguard.flags b/proguard.flags
@@ -7,6 +7,7 @@
   public void onClickConfigureButton(android.view.View);
   public void onClickAllAppsButton(android.view.View);
   public void onClickAppMarketButton(android.view.View);
+  public void onClickOverflowMenuButton(android.view.View);
   public void dismissWorkspaceCling(android.view.View);
   public void dismissAllAppsCling(android.view.View);
   public void dismissAllAppsSortCling(android.view.View);
@@ -56,4 +57,4 @@
   public float getHorizontalWallpaperOffset();
 }
 
--keep class com.cyanogenmod.trebuchet.preference.Preferences$*Fragment
+-keep class com.cyanogenmod.trebuchet.preference.Preferences$*Fragment
diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png
diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png
diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png
diff --git a/res/layout-sw720dp/hotseat.xml b/res/layout-sw720dp/hotseat.xml
@@ -17,20 +17,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:cellCountX="@integer/hotseat_cell_count"
-    launcher:cellCountY="1">
-    <com.cyanogenmod.trebuchet.CellLayout
-        android:id="@+id/layout"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:paddingTop="@dimen/button_bar_height_top_padding"
-        android:paddingBottom="@dimen/button_bar_height_bottom_padding"
-        android:paddingLeft="@dimen/button_bar_width_left_padding"
-        android:paddingRight="@dimen/button_bar_width_right_padding"
-
-        launcher:cellWidth="@dimen/hotseat_cell_width"
-        launcher:cellHeight="@dimen/hotseat_cell_height"
-        launcher:widthGap="@dimen/hotseat_width_gap"
-        launcher:heightGap="@dimen/hotseat_height_gap"
-        launcher:maxGap="@dimen/hotseat_width_gap" />
-</com.cyanogenmod.trebuchet.Hotseat>
+    launcher:cellCountY="1" />
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
@@ -36,14 +36,7 @@
         launcher:cellCountY="@integer/cell_count_y"
         launcher:pageSpacing="@dimen/workspace_page_spacing"
         launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left"
-        launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right">
-
-        <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
-        <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-    </com.cyanogenmod.trebuchet.Workspace>
+        launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right" />
 
     <include
         android:id="@+id/dock_divider"

diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
@@ -40,6 +40,12 @@
                 android:background="@drawable/tab_unselected_holo"
                 android:tabStripEnabled="false"
                 android:divider="@null" />
+            <include
+                android:id="@+id/overflow_menu_button"
+                layout="@layout/overflow_menu_button"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="right" />
             <include
                 android:id="@+id/market_button"
                 layout="@layout/market_button"

diff --git a/res/layout/overflow_menu_button.xml b/res/layout/overflow_menu_button.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+    style="@style/MarketButton"
+    android:onClick="onClickOverflowMenuButton"
+    android:drawableLeft="@drawable/ic_menu_overflow"
+    android:gravity="center"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:background="@drawable/tab_widget_indicator_selector"
+    android:contentDescription="@string/menu"
+    android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
+    android:shadowDx="0.0"
+    android:shadowDy="0.0"
+    android:shadowRadius="2.0"
+    android:focusable="true"
+    android:clickable="true" />
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
@@ -18,6 +18,12 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="preferences_interface_homescreen_indicator_position_entries">
+        <item>Oberhalb des Docks</item>
+        <item>Oben</item>
+        <item>Unten</item>
+    </string-array>
+
     <string-array name="preferences_interface_homescreen_scrolling_transition_effect_entries">
         <item>Standard</item>
         <item>Tablett</item>
@@ -26,7 +32,7 @@
         <item>Rotieren oben</item>
         <item>Rotieren unten</item>
         <item>Zylinder innen</item>
-        <item>zylinder außen</item>
+        <item>Zylinder außen</item>
         <item>Würfel innen</item>
         <item>Würfel außen</item>
         <item>Wirbeln</item>
@@ -52,6 +58,11 @@
         <item>Akkordeon</item>
     </string-array>
 
+    <string-array name="preferences_interface_drawer_indicator_position_entries">
+        <item>Oben/Links</item>
+        <item>Unten/Rechts</item>
+    </string-array>
+
     <string-array name="preferences_interface_drawer_orientation_entries">
         <item>Horizontal</item>
         <item>Vertikal</item>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -39,6 +39,8 @@
     <string name="group_applications" msgid="2103752818818161976">"Apps"</string>
     <string name="group_shortcuts" msgid="9133529424900391877">"Verknüpfungen"</string>
     <string name="group_widgets" msgid="6704978494073105844">"Widgets"</string>
+    <!-- Options in "Add to Home" dialog box; Title of the group containing the list of all launcher actions -->
+    <string name="group_actions">Aktionen</string>
     <string name="group_wallpapers" msgid="1568191644272224858">"Hintergründe"</string>
     <string name="completely_out_of_space" msgid="1759078539443491182">"Auf Ihrem Startbildschirm ist kein Platz mehr vorhanden."</string>
     <string name="out_of_space" msgid="8365249326091984698">"Auf dem Startbildschirm ist kein Platz mehr vorhanden."</string>
@@ -57,6 +59,8 @@
     <string name="cancel_target_label">Abbrechen</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Deinstallieren"</string>
     <string name="info_target_label" msgid="4019495079517426980">"App-Info"</string>
+    <!-- Label for the info icon. [CHAR_LIMIT=30] -->
+    <string name="edit_target_label">Bearbeiten</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Suchen"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Sprachsuche"</string>
     <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Apps"</string>
@@ -76,6 +80,14 @@
     <!-- Noun, menu item used to sort apps by install date -->
     <string name="menu_apps_sort_install_date">Installationsdatum</string>
 
+    <!-- Noun, menu item used to show system apps -->
+    <string name="menu_apps_filter_system">System</string>
+    <!-- Noun, menu item used to show downloaded apps -->
+    <string name="menu_apps_filter_downloaded">Heruntergeladen</string>
+
+    <!-- Noun, menu item used to reset hidden apps list -->
+    <string name="menu_hidden_apps_delete">Zurücksetzen</string>
+
     <string name="cab_menu_delete_app" msgid="4089398025537640349">"App deinstallieren"</string>
     <string name="cab_menu_app_info" msgid="914548323652698884">"App-Details"</string>
     <string name="cab_app_selection_text" msgid="6378522164293415735">"1 App ausgewählt"</string>
@@ -157,6 +169,9 @@
     <!-- Dummy string [CHAR_LIMIT=60] -->
     <string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
 
+    <!-- Hidden apps -->
+    <string name="hidden_apps_title">Versteckte Apps</string>
+
     <!--             -->
     <!-- Preferences -->
     <!--             -->
@@ -168,18 +183,19 @@
 
     <!-- UI -->
     <!-- Homescreen -->
-    <string name="preferences_interface_homescreen_title">Seiten</string>
+    <string name="preferences_interface_homescreen_title">Bildschirmseiten</string>
+    <string name="preferences_interface_homescreen_summary">Bildschirmseiten und Hintergrundbild</string>
     <string name="preferences_interface_homescreen_general_category">Allgemein</string>
     <string name="preferences_interface_homescreen_general_screens_title">Seitenzahl</string>
-    <string name="preferences_interface_homescreen_general_screens_summary">Anzahl der verwendbaren und wechselbaren Seiten für Icons und Widgets</string>
+    <string name="preferences_interface_homescreen_general_screens_summary">Anzahl der verwendbaren und wechselbaren Bildschirmseiten für Icons und Widgets</string>
     <string name="preferences_interface_homescreen_general_default_screen_title">Standardseite</string>
-    <string name="preferences_interface_homescreen_general_default_screen_summary">Aktive Seite nach Neustart des Geräts</string>
+    <string name="preferences_interface_homescreen_general_default_screen_summary">Aktive Bildschirmseite nach Neustart des Geräts</string>
     <string name="preferences_interface_homescreen_general_grid_title">Rastergröße</string>
     <string name="preferences_interface_homescreen_general_grid_summary">Anzahl der für Icons verfügbaren Reihen / Spalten</string>
     <string name="preferences_interface_homescreen_general_grid_rows_title">Reihen</string>
     <string name="preferences_interface_homescreen_general_grid_columns_title">Spalten</string>
     <string name="preferences_interface_homescreen_general_stretch_screens_title">Seiten ausdehnen</string>
-    <string name="preferences_interface_homescreen_general_stretch_screens_summary">Seiten bildschirmfüllend ausdehen</string>
+    <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>
@@ -193,6 +209,8 @@
     <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Hintergrundbild bei Seitenwechsel scrollen</string>
     <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_title">Hintergrundbild schneller rendern</string>
     <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_summary">Flüssigere Darstellung von statischen Hintergrundbildern</string>
+    <string name="preferences_interface_homescreen_scrolling_wallpaper_size_title">Hintergrundbildgröße</string>
+    <string name="preferences_interface_homescreen_scrolling_wallpaper_size_summary">Größe des Hintergrundbilds in Seitenbreiten festlegen</string>
     <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Seiten einblenden</string>
     <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Beim Scrollen die Seiten einblenden</string>
     <string name="preferences_interface_homescreen_scrolling_show_outlines_title">Umriss anzeigen</string>
@@ -202,11 +220,16 @@
     <string name="preferences_interface_homescreen_indicator_enable_summary">Seitenindikator anzeigen</string>
     <string name="preferences_interface_homescreen_indicator_fade_title">Automatisch ausblenden</string>
     <string name="preferences_interface_homescreen_indicator_fade_summary">Indikator nach Seitenwechsel ausblenden</string>
+    <string name="preferences_interface_homescreen_indicator_position_title">Indikator-Position</string>
+    <string name="preferences_interface_homescreen_indicator_position_summary">Anzeigeposition des Indikators auswählen</string>
 
     <!-- Drawer -->
     <string name="preferences_interface_drawer_title">Apps</string>
+    <string name="preferences_interface_drawer_summary">Apps und Widgets</string>
     <string name="preferences_interface_drawer_orientation_title">Ausrichtung</string>
     <string name="preferences_interface_drawer_orientation_summary">Scrollrichtung der App-Seiten auswählen</string>
+    <string name="preferences_interface_drawer_hidden_apps_title">Versteckte Apps</string>
+    <string name="preferences_interface_drawer_hidden_apps_summary">Apps auf den App-Seiten verstecken.</string>
     <string name="preferences_interface_drawer_widgets_category">Widget-Seiten</string>
     <string name="preferences_interface_drawer_widgets_join_apps_title">Mit App-Seiten verbinden</string>
     <string name="preferences_interface_drawer_widgets_join_apps_summary">Blättern auch zwischen App- und Widget-Seiten</string>
@@ -223,11 +246,21 @@
 
     <!-- Dock -->
     <string name="preferences_interface_dock_title">Dock</string>
+    <string name="preferences_interface_dock_pages_title">Seiten</string>
+    <string name="preferences_interface_dock_pages_summary">Anzahl der Seiten im Dock</string>
+    <string name="preferences_interface_dock_default_page_title">Standardseite</string>
+    <string name="preferences_interface_dock_default_page_summary">Die Standardseite festlegen</string>
+    <string name="preferences_interface_dock_icons_title">Icons</string>
+    <string name="preferences_interface_dock_icons_summary">Anzahl der Icons/Spalten des Docks festlegen</string>
+    <string name="preferences_interface_dock_divider_title">Dock-Abtrennung anzeigen</string>
+    <string name="preferences_interface_dock_divider_summary">Linie als Indikator-Hintergrund anzeigen</string>
 
     <!-- Icons -->
     <string name="preferences_interface_icons_title">Icons</string>
 
     <!-- General -->
     <string name="preferences_interface_general_title">Allgemein</string>
     <string name="preferences_interface_general_orientation_title">Automatische Seitenausrichtung</string>
+    <string name="preferences_interface_general_fullscreen_title">Vollbildmodus</string>
+    <string name="preferences_interface_general_fullscreen_summary">Statusleiste für Vollbildansicht ausblenden</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -123,6 +123,8 @@
     <string name="all_apps_sort_cling_title">Ordenar aplicaciones</string>
     <string name="all_apps_sort_cling_add_item">Mantener pulsación sobre la pestaña Aplicaciones para elegir el método de ordenación</string>
     <string name="hidden_apps_title">Aplicaciones ocultas</string>
+    <string name="edit_target_label">Editar</string>
+    <string name="group_actions">Acciones</string>
     <string name="preferences_title">Preferencias</string>
     <string name="preferences_interface_title">Interfaz</string>
     <string name="preferences_application_title">Aplicación</string>
@@ -187,6 +189,12 @@
     <string name="preferences_interface_drawer_indicator_position_title">Posición</string>
     <string name="preferences_interface_drawer_indicator_position_summary">Establecer dónde se mostrará el indicador de página</string>
     <string name="preferences_interface_dock_title">Barra de aplicaciones</string>
+    <string name="preferences_interface_dock_pages_title">Páginas</string>
+    <string name="preferences_interface_dock_pages_summary">Número de páginas en la barra de aplicaciones</string>
+    <string name="preferences_interface_dock_default_page_title">Página por defecto</string>
+    <string name="preferences_interface_dock_default_page_summary">Escoger la página por defecto</string>
+    <string name="preferences_interface_dock_icons_title">Iconos</string>
+    <string name="preferences_interface_dock_icons_summary">Número de iconos en la barra de aplicaciones</string>
     <string name="preferences_interface_dock_divider_title">Separador</string>
     <string name="preferences_interface_dock_divider_summary">Mostrar una línea divisoria sobre la barra de aplicaciones</string>
     <string name="preferences_interface_icons_title">Iconos</string>