diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-02-11 10:29:21 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-02-11 10:29:21 -0800 |
| commit | 77b78aa6659383fc7d7f8f73c340e23b2d48154b (patch) | |
| tree | 2ef11a689979e7e8d3012c87768434e0218392ac | |
| parent | feb8b8634952d4dc48ec3dd3bfb5d9ec0e5425e8 (diff) | |
| parent | d5f4c6614f69b79fb0c2a96d97b24bcf8eff6c3b (diff) | |
| download | android_packages_apps_Trebuchet-77b78aa6659383fc7d7f8f73c340e23b2d48154b.tar.gz android_packages_apps_Trebuchet-77b78aa6659383fc7d7f8f73c340e23b2d48154b.tar.bz2 android_packages_apps_Trebuchet-77b78aa6659383fc7d7f8f73c340e23b2d48154b.zip | |
Merge remote-tracking branch 'github/cm-11.0' into HEAD
26 files changed, 669 insertions, 665 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 13cf636fc..f33bb0b30 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -166,7 +166,7 @@ <!-- Intent received used to install shortcuts from other applications --> <receiver android:name="com.android.launcher3.InstallShortcutReceiver" - android:permission="com.android.launcher3.permission.INSTALL_SHORTCUT"> + android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"> <intent-filter> <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" /> </intent-filter> @@ -175,7 +175,7 @@ <!-- Intent received used to uninstall shortcuts from other applications --> <receiver android:name="com.android.launcher3.UninstallShortcutReceiver" - android:permission="com.android.launcher3.permission.UNINSTALL_SHORTCUT"> + android:permission="com.android.launcher.permission.UNINSTALL_SHORTCUT"> <intent-filter> <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" /> </intent-filter> diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml index 820f00a6d..19a93a5f3 100644 --- a/res/layout-land/all_apps_cling.xml +++ b/res/layout-land/all_apps_cling.xml @@ -16,33 +16,49 @@ <com.android.launcher3.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:drawIdentifier="all_apps_landscape"> + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:drawIdentifier="all_apps"> <FrameLayout + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginStart="40dp" - android:layout_marginTop="40dp"> + android:layout_marginStart="25dp" + android:layout_marginEnd="25dp" + android:layout_marginTop="310dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="top" android:orientation="vertical"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/all_apps_cling_title" - android:text="@string/all_apps_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/all_apps_cling_add_item" + <LinearLayout + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/all_apps_cling_add_item" /> + android:orientation="vertical" + android:background="@drawable/cling"> + <TextView + style="@style/ClingTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_cm" /> + <TextView + style="@style/ClingText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_summary" /> + </LinearLayout> </LinearLayout> </FrameLayout> <Button style="@style/ClingButton" - android:id="@+id/cling_dismiss" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginBottom="15dp" - android:layout_marginEnd="10dp" + android:layout_marginEnd="20dp" android:layout_gravity="bottom|end" android:onClick="dismissAllAppsCling" /> </com.android.launcher3.Cling> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 3666b5986..2f64efe39 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -94,6 +94,12 @@ android:layout_height="match_parent" android:visibility="invisible" /> + <include layout="@layout/all_apps_cling" + android:id="@+id/all_apps_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + <include layout="@layout/overview_panel" android:id="@+id/overview_panel" android:visibility="gone" /> diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml index 62284ec73..ed99d78a0 100644 --- a/res/layout-port/all_apps_cling.xml +++ b/res/layout-port/all_apps_cling.xml @@ -16,33 +16,50 @@ <com.android.launcher3.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:drawIdentifier="all_apps_portrait"> + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:drawIdentifier="all_apps"> <FrameLayout + android:id="@+id/content" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginTop="20dp"> + android:layout_height="match_parent"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="top" + android:layout_marginStart="25dp" + android:layout_marginEnd="25dp" + android:layout_marginTop="30dp" android:orientation="vertical"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/all_apps_cling_title" - android:text="@string/all_apps_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/all_apps_cling_add_item" - android:layout_width="285dp" + <LinearLayout + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/all_apps_cling_add_item" /> + android:orientation="vertical" + android:background="@drawable/cling"> + <TextView + style="@style/ClingTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_cm" /> + <TextView + style="@style/ClingText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_summary" /> + </LinearLayout> </LinearLayout> </FrameLayout> + <Button style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginBottom="15dp" - android:layout_marginEnd="10dp" - android:layout_gravity="bottom|end" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="60dp" + android:layout_marginRight="20dp" + android:layout_gravity="bottom|right" android:onClick="dismissAllAppsCling" /> </com.android.launcher3.Cling> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 11f74ba1d..98cd0f3b6 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -99,6 +99,12 @@ android:layout_height="match_parent" android:visibility="invisible" /> + <include layout="@layout/all_apps_cling" + android:id="@+id/all_apps_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + <include layout="@layout/overview_panel" android:id="@+id/overview_panel" android:visibility="gone" /> diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml deleted file mode 100644 index cf65e410d..000000000 --- a/res/layout-sw600dp-port/all_apps_cling.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?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. ---> -<com.android.launcher3.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:drawIdentifier="all_apps_portrait"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginTop="20dp"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/all_apps_cling_title" - android:text="@string/all_apps_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/all_apps_cling_add_item" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/all_apps_cling_add_item" /> - </LinearLayout> - </FrameLayout> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:minWidth="168dp" - android:textSize="24sp" - android:layout_marginTop="235dp" - android:layout_marginEnd="36dp" - android:layout_gravity="top|end" - android:onClick="dismissAllAppsCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-sw720dp/all_apps_cling.xml b/res/layout-sw720dp/all_apps_cling.xml deleted file mode 100644 index 824d84f0d..000000000 --- a/res/layout-sw720dp/all_apps_cling.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?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. ---> -<com.android.launcher3.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:drawIdentifier="all_apps_large"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/cling_text_block_offset_x" - android:layout_marginTop="@dimen/cling_text_block_offset_y"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/all_apps_cling_title" - android:text="@string/all_apps_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/all_apps_cling_add_item" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/all_apps_cling_add_item" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="15dp" - android:onClick="dismissAllAppsCling" /> - </LinearLayout> - </FrameLayout> -</com.android.launcher3.Cling> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 4f6aaf503..7b0d770ec 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -94,6 +94,12 @@ android:layout_height="match_parent" android:visibility="invisible" /> + <include layout="@layout/all_apps_cling" + android:id="@+id/all_apps_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + <include layout="@layout/overview_panel" android:id="@+id/overview_panel" android:visibility="gone" /> diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml index 18b83e09e..a5cc99f21 100644 --- a/res/values-cs/cm_strings.xml +++ b/res/values-cs/cm_strings.xml @@ -30,11 +30,9 @@ <string name="wallpaper_scroll">Posouvání tapety</string> <string name="preferences_title">Nastavení</string> - <string name="preferences_interface_title">Rozhraní</string> <string name="preferences_application_title">Aplikace</string> <string name="preferences_interface_homescreen_title">Domovská plocha</string> - <string name="preferences_interface_homescreen_summary">Plochy a tapety</string> <string name="preferences_interface_homescreen_search_title">Vyhledávací lišta</string> <string name="preferences_interface_homescreen_search_summary">Trvale zobrazit lištu vyhledávání vždy u horní hrany plochy</string> diff --git a/res/values-es/cm_translations.xml b/res/values-es/cm_translations.xml new file mode 100644 index 000000000..caa1a8f98 --- /dev/null +++ b/res/values-es/cm_translations.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The CyanogenMod 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. +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="sort_button_text">Ordenar</string> + <string name="filter_button_text">Filtrar</string> + <string name="default_screen_button_text">Pantalla por defecto</string> + <string name="transition_effect_button_text">Efecto de desplazamiento</string> + <string name="sort_mode_title">Título</string> + <string name="sort_mode_launch_count">Veces ejecutado</string> + <string name="sort_mode_install_time">Fecha de instalación</string> + <string name="scrolling_page_outlines">Bordes de pantalla</string> + <string name="scrolling_fade_adjacent">Efecto de fundido</string> + <string name="wallpaper_scroll">Desplazar fondo</string> + <string name="preferences_title">Ajustes</string> + <string name="preferences_application_title">Aplicación</string> + <string name="preferences_interface_homescreen_title">Pantalla de inicio</string> + <string name="preferences_interface_homescreen_search_title">Barra de búsqueda</string> + <string name="preferences_interface_homescreen_search_summary">Habilitar la barra de búsqueda permanentemente</string> + <string name="preferences_interface_drawer_title">Aplicaciones</string> + <string name="preferences_interface_dock_title">Barra de aplicaciones</string> + <string name="preferences_interface_general_title">General</string> + <string name="preferences_interface_general_icons_category">Iconos</string> + <string name="preferences_interface_general_icons_large_title">Iconos grandes</string> + <string name="preferences_interface_general_icons_large_summary">Usar iconos grandes en la pantalla de inicio y de aplicaciones</string> + <string name="preferences_interface_general_icons_text_style_title">Estilo del texto</string> + <string name="preferences_interface_general_icons_text_style_summary">Cambiar el estilo de texto para las etiquetas de los iconos</string> + <string name="dialog_pick_iconpack_title">Escoger paquete de iconos</string> + <string name="default_iconpack_title">Iconos por defecto</string> + <string name="icon_packs_title">Paquetes de iconos</string> + <string name="no_iconpacks_summary">No hay paquetes de iconos instalados</string> + <string name="all_apps_cling_cm">Personalizar tus aplicaciones</string> + <string name="all_apps_cling_summary">Tocar el indicador de página para mostrar ajustes adicionales</string> + <string-array name="preferences_interface_general_icons_text_font_family_entries"> + <item>Normal</item> + <item>Fina</item> + <item>Comprimida</item> + </string-array> + <string-array name="transition_effect_entries"> + <item>Ninguno</item> + <item>Zoom entrante</item> + <item>Zoom saliente</item> + <item>Rotar arriba</item> + <item>Rotar abajo</item> + <item>Cúbico entrante</item> + <item>Cúbico saliente</item> + <item>Apilar</item> + <item>Acordeón</item> + <item>Voltear</item> + <item>Cilíndrico entrante</item> + <item>Cilíndrico saliente</item> + <item>Carrusel</item> + <item>Perspectiva</item> + </string-array> +</resources> diff --git a/res/values-pt/cm_strings.xml b/res/values-pt/cm_strings.xml index bd95ddb67..d2353e087 100644 --- a/res/values-pt/cm_strings.xml +++ b/res/values-pt/cm_strings.xml @@ -16,10 +16,8 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="preferences_title">Preferências</string> - <string name="preferences_interface_title">Interface</string> <string name="preferences_application_title">Aplicação</string> <string name="preferences_interface_homescreen_title">Tela Inicial</string> - <string name="preferences_interface_homescreen_summary">Telas e papéis de parede</string> <string name="preferences_interface_general_title">Geral</string> <string name="preferences_interface_drawer_title">Gaveta de apps</string> <string name="preferences_interface_dock_title">Dock</string> @@ -41,4 +39,4 @@ <string name="preferences_interface_general_icons_large_summary">Usar ícones de aplicação extra grandes na tela inicial e gaveta de aplicativos</string> <string name="preferences_interface_general_icons_text_style_title">Estilo da fonte</string> <string name="preferences_interface_general_icons_text_style_summary">Estilo da fonte para usar nos textos dos ícones</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-sw320dp/dimens.xml b/res/values-sw320dp/dimens.xml new file mode 100644 index 000000000..bcc465e94 --- /dev/null +++ b/res/values-sw320dp/dimens.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<resources> + <!-- Workspace --> + <dimen name="overview_panel_bottom_padding">35dp</dimen> + <dimen name="overview_panel_button_spacing">15dp</dimen> +</resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index f2cb2f5cf..8b532ca34 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -18,7 +18,7 @@ <!-- Application name --> <string name="cm_application_name" translatable="false">Trebuchet</string> <!-- App copyright --> - <string name="application_copyright" translatable="false">Copyright \u00A9 2014 The CyanogenMod Project</string> + <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string> <!-- App version --> <string name="application_version" translatable="false">1.0</string> @@ -44,15 +44,12 @@ <!-- Settings --> <string name="preferences_title">Settings</string> - <!-- UI --> - <string name="preferences_interface_title">Interface</string> <!-- Application --> <string name="preferences_application_title">App</string> <!-- UI --> <!-- Homescreen --> <string name="preferences_interface_homescreen_title">Homescreen</string> - <string name="preferences_interface_homescreen_summary">Screens and wallpaper</string> <string name="preferences_interface_homescreen_search_title">Search bar</string> <string name="preferences_interface_homescreen_search_summary">Show persistent search bar at top of screen</string> @@ -76,4 +73,9 @@ <!-- Folder titles --> <string name="google_title" translatable="false">Google</string> + + <!-- The title text for the all apps cling [CHAR_LIMIT=60] --> + <string name="all_apps_cling_cm">Customize your drawer</string> + <!-- The description of how to access Trebuchet settings [CHAR_LIMIT=160] --> + <string name="all_apps_cling_summary">Tap the page indicator to view additional configuration settings</string> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 3c1dc36f7..b7880fe1f 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -33,7 +33,7 @@ <integer name="config_appsCustomizeWorkspaceAnimationStagger">40</integer> <integer name="config_workspaceAppsCustomizeAnimationStagger">100</integer> - <integer name="config_workspaceDefaultScreen">1</integer> + <integer name="config_workspaceDefaultScreen">0</integer> <!-- Tab transition animation duration --> <integer name="config_tabTransitionDuration">250</integer> diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml index 15bae7feb..64896f245 100644 --- a/res/xml-sw600dp/default_workspace.xml +++ b/res/xml-sw600dp/default_workspace.xml @@ -15,57 +15,27 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> - <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="1" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> + <!-- Screen [1] --> <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge" + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" launcher:screen="1" - launcher:x="1" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="1" - launcher:y="5" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="4" - launcher:y="5" /> + launcher:spanX="5" + launcher:spanY="3" /> <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" launcher:screen="1" launcher:x="4" - launcher:y="5" /> - - <!-- Middle screen [2] --> - <appwidget - launcher:packageName="com.cyanogenmod.lockclock" - launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" - launcher:x="1" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="3" /> + launcher:y="4" /> <folder - launcher:screen="2" - launcher:x="1" - launcher:y="5" + launcher:screen="1" + launcher:x="0" + launcher:y="4" launcher:title="@string/google_title"> <favorite launcher:className="com.google.android.maps.MapsActivity" @@ -77,15 +47,6 @@ launcher:className="com.google.android.apps.plus.phone.HomeActivity" launcher:packageName="com.google.android.apps.plus" /> <favorite - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:packageName="com.google.android.music" /> - <favorite - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:packageName="com.google.android.youtube" /> - <favorite - launcher:className="com.google.android.talk.SigningInActivity" - launcher:packageName="com.google.android.talk" /> - <favorite launcher:className="com.android.calendar.AllInOneActivity" launcher:packageName="com.google.android.calendar" /> <favorite @@ -96,92 +57,115 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" launcher:x="4" - launcher:y="5" /> + launcher:y="4" /> - <!-- Right screen [3] --> + <!-- Screen [2] --> + <favorite + launcher:packageName="com.cyanogenmod.gallerynext" + launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.gallery3d" + launcher:className="com.android.gallery3d.app.Gallery" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.settings" + launcher:className="com.android.settings.Settings" + launcher:container="-100" + launcher:screen="2" + launcher:x="4" + launcher:y="4" /> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" - launcher:x="1" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="5" + launcher:spanY="4" /> <appwidget launcher:packageName="com.android.mms" launcher:className="com.android.mms.widget.MmsWidgetProvider" - launcher:screen="3" - launcher:x="1" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="1" - launcher:y="5" /> - <favorite - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="4" - launcher:y="5" /> - - <!-- Far-right screen [4] --> + launcher:spanX="5" + launcher:spanY="2" /> - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <!-- Hotseat --> <favorite - launcher:packageName="com.android.dialer" - launcher:className="com.android.dialer.DialtactsActivity" + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" launcher:container="-101" - launcher:screen="1" - launcher:x="1" + launcher:screen="4" + launcher:x="4" launcher:y="0" /> <favorite launcher:packageName="com.android.mms" launcher:className="com.android.mms.ui.ConversationList" launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" /> - <favorite - launcher:packageName="com.android.email" - launcher:className="com.android.email.activity.Welcome" - launcher:container="-101" - launcher:screen="2" - launcher:x="2" + launcher:screen="4" + launcher:x="4" launcher:y="0" /> <favorite launcher:packageName="com.android.chrome" launcher:className="com.google.android.apps.chrome.Main" launcher:container="-101" - launcher:screen="4" - launcher:x="4" + launcher:screen="5" + launcher:x="5" launcher:y="0" /> <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" - launcher:screen="4" - launcher:x="4" + launcher:screen="5" + launcher:x="5" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.music" + launcher:className="com.android.music.activitymanagement.TopLevelActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" launcher:y="0" /> <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="2" + launcher:x="2" launcher:y="0" /> <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.GalleryActivity" + launcher:packageName="com.google.android.youtube" + launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="1" + launcher:x="1" launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="1" + launcher:x="1" + launcher:y="0" /> + </favorites> diff --git a/res/xml-sw600dp/default_workspace_no_telephony.xml b/res/xml-sw600dp/default_workspace_no_telephony.xml index 96162ef28..fb81f178b 100644 --- a/res/xml-sw600dp/default_workspace_no_telephony.xml +++ b/res/xml-sw600dp/default_workspace_no_telephony.xml @@ -15,57 +15,27 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> - <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="1" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> + <!-- Screen [1] --> <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge" + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" launcher:screen="1" - launcher:x="1" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="1" - launcher:y="5" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="4" - launcher:y="5" /> + launcher:spanX="5" + launcher:spanY="3" /> <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" launcher:screen="1" launcher:x="4" - launcher:y="5" /> - - <!-- Middle screen [2] --> - <appwidget - launcher:packageName="com.cyanogenmod.lockclock" - launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" - launcher:x="1" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="3" /> + launcher:y="4" /> <folder - launcher:screen="2" - launcher:x="1" - launcher:y="5" + launcher:screen="1" + launcher:x="0" + launcher:y="4" launcher:title="@string/google_title"> <favorite launcher:className="com.google.android.maps.MapsActivity" @@ -77,15 +47,6 @@ launcher:className="com.google.android.apps.plus.phone.HomeActivity" launcher:packageName="com.google.android.apps.plus" /> <favorite - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:packageName="com.google.android.music" /> - <favorite - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:packageName="com.google.android.youtube" /> - <favorite - launcher:className="com.google.android.talk.SigningInActivity" - launcher:packageName="com.google.android.talk" /> - <favorite launcher:className="com.android.calendar.AllInOneActivity" launcher:packageName="com.google.android.calendar" /> <favorite @@ -96,92 +57,115 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" launcher:x="4" - launcher:y="5" /> + launcher:y="4" /> - <!-- Right screen [3] --> + <!-- Screen [2] --> + <favorite + launcher:packageName="com.cyanogenmod.gallerynext" + launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.gallery3d" + launcher:className="com.android.gallery3d.app.Gallery" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.settings" + launcher:className="com.android.settings.Settings" + launcher:container="-100" + launcher:screen="2" + launcher:x="4" + launcher:y="4" /> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" - launcher:x="1" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="5" + launcher:spanY="4"/> <appwidget launcher:packageName="com.android.settings" launcher:className="com.android.settings.widget.SettingsAppWidgetProvider" - launcher:screen="3" - launcher:x="1" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" launcher:y="0" - launcher:spanX="4" + launcher:spanX="5" launcher:spanY="1" /> - <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="1" - launcher:y="5" /> - <favorite - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="4" - launcher:y="5" /> - <!-- Far-right screen [4] --> - - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> - <favorite - launcher:packageName="com.android.contacts" - launcher:className="com.android.contacts.activities.PeopleActivity" - launcher:container="-101" - launcher:screen="1" - launcher:x="1" - launcher:y="0" /> + <!-- Hotseat --> <favorite - launcher:packageName="com.google.android.gm" - launcher:className="com.google.android.gm.ConversationListActivityGmail" + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" launcher:container="-101" - launcher:screen="2" - launcher:x="2" + launcher:screen="4" + launcher:x="4" launcher:y="0" /> <favorite launcher:packageName="com.android.email" launcher:className="com.android.email.activity.Welcome" launcher:container="-101" - launcher:screen="2" - launcher:x="2" + launcher:screen="4" + launcher:x="4" launcher:y="0" /> <favorite launcher:packageName="com.android.chrome" launcher:className="com.google.android.apps.chrome.Main" launcher:container="-101" - launcher:screen="4" - launcher:x="4" + launcher:screen="5" + launcher:x="5" launcher:y="0" /> <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" - launcher:screen="4" - launcher:x="4" + launcher:screen="5" + launcher:x="5" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.music" + launcher:className="com.android.music.activitymanagement.TopLevelActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" launcher:y="0" /> <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="2" + launcher:x="2" launcher:y="0" /> <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.GalleryActivity" + launcher:packageName="com.google.android.youtube" + launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="1" + launcher:x="1" launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="1" + launcher:x="1" + launcher:y="0" /> + </favorites> diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml index 15e054b1b..e9231cc37 100644 --- a/res/xml-sw720dp/default_workspace.xml +++ b/res/xml-sw720dp/default_workspace.xml @@ -15,56 +15,26 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> + <!-- Screen [1] --> <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge" + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" launcher:screen="1" - launcher:x="2" + launcher:x="1" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="2" - launcher:y="4" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="5" - launcher:y="4" /> + launcher:spanX="6" + launcher:spanY="3" /> <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" launcher:screen="1" - launcher:x="5" + launcher:x="7" launcher:y="4" /> - - <!-- Middle screen [2] --> - <appwidget - launcher:packageName="com.cyanogenmod.lockclock" - launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" - launcher:x="2" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="3" /> <folder - launcher:screen="2" - launcher:x="2" + launcher:screen="1" + launcher:x="0" launcher:y="4" launcher:title="@string/google_title"> <favorite @@ -77,15 +47,6 @@ launcher:className="com.google.android.apps.plus.phone.HomeActivity" launcher:packageName="com.google.android.apps.plus" /> <favorite - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:packageName="com.google.android.music" /> - <favorite - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:packageName="com.google.android.youtube" /> - <favorite - launcher:className="com.google.android.talk.SigningInActivity" - launcher:packageName="com.google.android.talk" /> - <favorite launcher:className="com.android.calendar.AllInOneActivity" launcher:packageName="com.google.android.calendar" /> <favorite @@ -96,85 +57,114 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" - launcher:x="5" + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" + launcher:x="7" + launcher:y="4" /> + <favorite + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" launcher:y="4" /> - <!-- Right screen [3] --> + <!-- Screen [2] --> + <favorite + launcher:packageName="com.cyanogenmod.gallerynext" + launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.gallery3d" + launcher:className="com.android.gallery3d.app.Gallery" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.settings" + launcher:className="com.android.settings.Settings" + launcher:container="-100" + launcher:screen="2" + launcher:x="7" + launcher:y="4" /> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" - launcher:x="2" + launcher:container="-100" + launcher:screen="2" + launcher:x="1" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="6" + launcher:spanY="4"/> <appwidget launcher:packageName="com.android.mms" launcher:className="com.android.mms.widget.MmsWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="2" launcher:y="0" launcher:spanX="4" launcher:spanY="2" /> - <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="2" - launcher:y="4" /> - <favorite - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="5" - launcher:y="4" /> - <!-- Far-right screen [4] --> - - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <!-- Hotseat --> <favorite - launcher:packageName="com.android.dialer" - launcher:className="com.android.contacts.dialer.DialtactsActivity" + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" /> - <favorite - launcher:packageName="com.google.android.gm" - launcher:className="com.google.android.gm.ConversationListActivityGmail" - launcher:container="-101" - launcher:screen="3" - launcher:x="3" + launcher:screen="5" + launcher:x="5" launcher:y="0" /> <favorite launcher:packageName="com.android.mms" launcher:className="com.android.mms.ui.ConversationList" launcher:container="-101" - launcher:screen="3" - launcher:x="3" + launcher:screen="5" + launcher:x="5" launcher:y="0" /> <favorite launcher:packageName="com.android.chrome" launcher:className="com.google.android.apps.chrome.Main" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="6" + launcher:x="6" launcher:y="0" /> <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="6" + launcher:x="6" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.music" + launcher:className="com.android.music.activitymanagement.TopLevelActivity" + launcher:container="-101" + launcher:screen="3" + launcher:x="3" launcher:y="0" /> <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" launcher:container="-101" - launcher:screen="6" - launcher:x="6" + launcher:screen="3" + launcher:x="3" launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.youtube" + launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" /> + </favorites> diff --git a/res/xml-sw720dp/default_workspace_no_telephony.xml b/res/xml-sw720dp/default_workspace_no_telephony.xml index 7f6799089..b15cebbb4 100644 --- a/res/xml-sw720dp/default_workspace_no_telephony.xml +++ b/res/xml-sw720dp/default_workspace_no_telephony.xml @@ -15,56 +15,26 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> + <!-- Screen [1] --> <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge" + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" launcher:screen="1" - launcher:x="2" + launcher:x="1" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="6" + launcher:spanY="3"/> <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="2" - launcher:y="4" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="5" - launcher:y="4" /> - <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" launcher:screen="1" - launcher:x="5" + launcher:x="7" launcher:y="4" /> - - <!-- Middle screen [2] --> - <appwidget - launcher:packageName="com.cyanogenmod.lockclock" - launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" - launcher:x="2" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="3" /> <folder - launcher:screen="2" - launcher:x="2" + launcher:screen="1" + launcher:x="0" launcher:y="4" launcher:title="@string/google_title"> <favorite @@ -77,15 +47,6 @@ launcher:className="com.google.android.apps.plus.phone.HomeActivity" launcher:packageName="com.google.android.apps.plus" /> <favorite - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:packageName="com.google.android.music" /> - <favorite - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:packageName="com.google.android.youtube" /> - <favorite - launcher:className="com.google.android.talk.SigningInActivity" - launcher:packageName="com.google.android.talk" /> - <favorite launcher:className="com.android.calendar.AllInOneActivity" launcher:packageName="com.google.android.calendar" /> <favorite @@ -96,85 +57,115 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" - launcher:x="5" + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" + launcher:x="7" + launcher:y="4" /> + <favorite + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" launcher:y="4" /> - <!-- Right screen [3] --> + <!-- Screen [2] --> + <favorite + launcher:packageName="com.cyanogenmod.gallerynext" + launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.gallery3d" + launcher:className="com.android.gallery3d.app.Gallery" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.settings" + launcher:className="com.android.settings.Settings" + launcher:container="-100" + launcher:screen="2" + launcher:x="7" + launcher:y="4" /> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" - launcher:x="2" + launcher:container="-100" + launcher:screen="2" + launcher:x="1" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="6" + launcher:spanY="4"/> <appwidget launcher:packageName="com.android.settings" launcher:className="com.android.settings.widget.SettingsAppWidgetProvider" - launcher:screen="3" + launcher:container="-100" + launcher:screen="2" launcher:x="2" launcher:y="0" launcher:spanX="4" launcher:spanY="1" /> - <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="2" - launcher:y="4" /> - <favorite - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="5" - launcher:y="4" /> - <!-- Far-right screen [4] --> - - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <!-- Hotseat --> <favorite - launcher:packageName="com.android.contacts" - launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" /> - <favorite - launcher:packageName="com.google.android.gm" - launcher:className="com.google.android.gm.ConversationListActivityGmail" - launcher:container="-101" - launcher:screen="3" - launcher:x="3" + launcher:screen="5" + launcher:x="5" launcher:y="0" /> <favorite launcher:packageName="com.android.email" launcher:className="com.android.email.activity.Welcome" launcher:container="-101" - launcher:screen="3" - launcher:x="3" + launcher:screen="5" + launcher:x="5" launcher:y="0" /> <favorite launcher:packageName="com.android.chrome" launcher:className="com.google.android.apps.chrome.Main" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="6" + launcher:x="6" launcher:y="0" /> <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="6" + launcher:x="6" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.music" + launcher:className="com.android.music.activitymanagement.TopLevelActivity" + launcher:container="-101" + launcher:screen="3" + launcher:x="3" launcher:y="0" /> <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" launcher:container="-101" - launcher:screen="6" - launcher:x="6" + launcher:screen="3" + launcher:x="3" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.youtube" + launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" /> + </favorites> diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index bc2d2342a..54a9a0487 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -15,54 +15,16 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> - <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetSmall" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="1" - launcher:y="3" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="2" - launcher:y="3" /> - <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" - launcher:screen="1" - launcher:x="2" - launcher:y="3" /> - - <!-- Middle screen [2] --> + <!-- Screen [1] --> <appwidget launcher:packageName="com.cyanogenmod.lockclock" launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" + launcher:screen="1" launcher:x="0" launcher:y="0" launcher:spanX="4" launcher:spanY="2" /> - <folder launcher:screen="2" launcher:x="0" launcher:y="3" launcher:title="@string/google_title"> + <folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/google_title"> <favorite launcher:className="com.google.android.maps.MapsActivity" launcher:packageName="com.google.android.apps.maps" /> @@ -92,17 +54,29 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="3" /> + <favorite launcher:packageName="com.android.vending" launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" + launcher:screen="1" + launcher:x="3" + launcher:y="3" /> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" launcher:x="3" launcher:y="3" /> - <!-- Right screen [3] --> + <!-- Screen [2] --> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="0" launcher:y="0" launcher:spanX="4" @@ -110,26 +84,30 @@ <appwidget launcher:packageName="com.android.mms" launcher:className="com.android.mms.widget.MmsWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="0" launcher:y="0" launcher:spanX="4" launcher:spanY="2" /> <favorite + launcher:packageName="com.cyanogenmod.gallerynext" + launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" + launcher:screen="2" + launcher:x="0" + launcher:y="3" /> + <favorite launcher:packageName="com.android.gallery3d" launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="1" + launcher:screen="2" + launcher:x="0" launcher:y="3" /> <favorite launcher:packageName="com.android.settings" launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="2" + launcher:screen="2" + launcher:x="3" launcher:y="3" /> - <!-- Far-right screen [4] --> - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> <favorite launcher:packageName="com.android.dialer" diff --git a/res/xml/default_workspace_no_telephony.xml b/res/xml/default_workspace_no_telephony.xml index d0eda9cf3..ce11edd35 100644 --- a/res/xml/default_workspace_no_telephony.xml +++ b/res/xml/default_workspace_no_telephony.xml @@ -15,54 +15,16 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> - <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetSmall" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="1" - launcher:y="3" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="2" - launcher:y="3" /> - <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" - launcher:screen="1" - launcher:x="2" - launcher:y="3" /> - - <!-- Middle screen [2] --> + <!-- Screen [1] --> <appwidget launcher:packageName="com.cyanogenmod.lockclock" launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" + launcher:screen="1" launcher:x="0" launcher:y="0" launcher:spanX="4" launcher:spanY="2" /> - <folder launcher:screen="2" launcher:x="0" launcher:y="3" launcher:title="@string/google_title"> + <folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/google_title"> <favorite launcher:className="com.google.android.maps.MapsActivity" launcher:packageName="com.google.android.apps.maps" /> @@ -92,17 +54,29 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="3" /> + <favorite launcher:packageName="com.android.vending" launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" + launcher:screen="1" + launcher:x="3" + launcher:y="3" /> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" launcher:x="3" launcher:y="3" /> - <!-- Right screen [3] --> + <!-- Screen [2] --> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="0" launcher:y="0" launcher:spanX="4" @@ -110,26 +84,30 @@ <appwidget launcher:packageName="com.android.settings" launcher:className="com.android.settings.widget.SettingsAppWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="0" launcher:y="0" launcher:spanX="4" launcher:spanY="1" /> <favorite + launcher:packageName="com.cyanogenmod.gallerynext" + launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" + launcher:screen="2" + launcher:x="0" + launcher:y="3" /> + <favorite launcher:packageName="com.android.gallery3d" launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="1" + launcher:screen="2" + launcher:x="0" launcher:y="3" /> <favorite launcher:packageName="com.android.settings" launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="2" + launcher:screen="2" + launcher:x="3" launcher:y="3" /> - <!-- Far-right screen [4] --> - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> <favorite launcher:packageName="com.android.contacts" @@ -149,21 +127,21 @@ launcher:packageName="com.android.email" launcher:className="com.android.email.activity.Welcome" launcher:container="-101" - launcher:screen="3" + launcher:screen="1" launcher:x="1" launcher:y="0" /> <favorite launcher:packageName="com.android.chrome" launcher:className="com.google.android.apps.chrome.Main" launcher:container="-101" - launcher:screen="0" + launcher:screen="3" launcher:x="3" launcher:y="0" /> <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" - launcher:screen="4" + launcher:screen="3" launcher:x="3" launcher:y="0" /> <favorite diff --git a/res/xml/preferences_headers.xml b/res/xml/preferences_headers.xml index 367ef832a..bc919b2d5 100644 --- a/res/xml/preferences_headers.xml +++ b/res/xml/preferences_headers.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project +<!-- + Copyright (C) 2014 The CyanogenMod Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,19 +14,17 @@ See the License for the specific language governing permissions and limitations under the License. --> - <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> <header android:id="@+id/preferences_homescreen_section" android:fragment="com.android.launcher3.settings.SettingsActivity$HomescreenFragment" - android:title="@string/preferences_interface_homescreen_title" - android:summary="@string/preferences_interface_homescreen_summary" /> + android:title="@string/preferences_interface_homescreen_title" /> - <header android:id="@+id/preferences_drawer_section" + <!--<header android:id="@+id/preferences_drawer_section" android:title="@string/preferences_interface_drawer_title" /> <header android:id="@+id/preferences_dock_section" - android:title="@string/preferences_interface_dock_title" /> + android:title="@string/preferences_interface_dock_title" />--> <header android:id="@+id/preferences_general_section" android:fragment="com.android.launcher3.settings.SettingsActivity$GeneralFragment" diff --git a/src/com/android/launcher3/Cling.java b/src/com/android/launcher3/Cling.java index 338b722ab..01a54b4e1 100644 --- a/src/com/android/launcher3/Cling.java +++ b/src/com/android/launcher3/Cling.java @@ -18,7 +18,6 @@ package com.android.launcher3; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.app.ActivityOptions; import android.content.Context; import android.content.ComponentName; import android.content.Intent; @@ -41,6 +40,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen static final String FIRST_RUN_CLING_DISMISSED_KEY = "cling_gel.first_run.dismissed"; static final String WORKSPACE_CLING_DISMISSED_KEY = "cling_gel.workspace.dismissed"; static final String FOLDER_CLING_DISMISSED_KEY = "cling_gel.folder.dismissed"; + static final String ALL_APPS_CLING_DISMISSED_KEY = "cling_gel.all_apps.dismissed"; private static String FIRST_RUN_PORTRAIT = "first_run_portrait"; private static String FIRST_RUN_LANDSCAPE = "first_run_landscape"; @@ -54,6 +54,8 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen private static String FOLDER_LANDSCAPE = "folder_landscape"; private static String FOLDER_LARGE = "folder_large"; + private static String ALL_APPS = "all_apps"; + private static float FIRST_RUN_CIRCLE_BUFFER_DPS = 60; private static float WORKSPACE_INNER_CIRCLE_RADIUS_DPS = 50; private static float WORKSPACE_OUTER_CIRCLE_RADIUS_DPS = 60; @@ -78,6 +80,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen private int mBackgroundColor; private final Rect mInsets = new Rect(); + private int[] mPosition; public Cling(Context context) { this(context, null, 0); @@ -127,6 +130,13 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen } } + void setPunchThroughForView(View view) { + mPosition = new int[2]; + view.getLocationOnScreen(mPosition); + mPosition[0] += view.getWidth() / 2; + mPosition[1] += view.getHeight() / 2; + } + void setFocusedHotseatApp(int drawableId, int appRank, ComponentName cn, String title, String description) { // Get the app to draw @@ -173,7 +183,8 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) || mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) || mDrawIdentifier.equals(WORKSPACE_LARGE) || - mDrawIdentifier.equals(WORKSPACE_CUSTOM)) { + mDrawIdentifier.equals(WORKSPACE_CUSTOM) || + mDrawIdentifier.equals(ALL_APPS)) { View content = getContent(); content.setAlpha(0f); content.animate() @@ -300,7 +311,8 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen return (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) || mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) || mDrawIdentifier.equals(WORKSPACE_LARGE) - || mDrawIdentifier.equals(WORKSPACE_CUSTOM)); + || mDrawIdentifier.equals(WORKSPACE_CUSTOM) + || mDrawIdentifier.equals(ALL_APPS)); } @Override @@ -353,6 +365,9 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen mDrawIdentifier.equals(WORKSPACE_LARGE)) { mLauncher.dismissWorkspaceCling(null); return true; + } else if (mDrawIdentifier.equals(ALL_APPS)) { + mLauncher.dismissAllAppsCling(null); + return true; } return false; } @@ -379,7 +394,8 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen mBackground.draw(canvas); } else if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) || mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) || - mDrawIdentifier.equals(WORKSPACE_LARGE)) { + mDrawIdentifier.equals(WORKSPACE_LARGE) || + mDrawIdentifier.equals(ALL_APPS)) { // Initialize the draw buffer (to allow punching through) eraseBg = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(), Bitmap.Config.ARGB_8888); @@ -411,16 +427,23 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen mBubblePaint); } else if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) || mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) || - mDrawIdentifier.equals(WORKSPACE_LARGE)) { + mDrawIdentifier.equals(WORKSPACE_LARGE) || + mDrawIdentifier.equals(ALL_APPS)) { int offset = DynamicGrid.pxFromDp(WORKSPACE_CIRCLE_Y_OFFSET_DPS, metrics); mErasePaint.setAlpha((int) (128)); - eraseCanvas.drawCircle(metrics.widthPixels / 2, - metrics.heightPixels / 2 - offset, + int punchX = metrics.widthPixels / 2; + int punchY = metrics.heightPixels / 2 - offset; + if (mPosition != null) { + punchX = mPosition[0]; + punchY = mPosition[1]; + } + eraseCanvas.drawCircle(punchX, + punchY, DynamicGrid.pxFromDp(WORKSPACE_OUTER_CIRCLE_RADIUS_DPS, metrics), mErasePaint); mErasePaint.setAlpha(0); - eraseCanvas.drawCircle(metrics.widthPixels / 2, - metrics.heightPixels / 2 - offset, + eraseCanvas.drawCircle(punchX, + punchY, DynamicGrid.pxFromDp(WORKSPACE_INNER_CIRCLE_RADIUS_DPS, metrics), mErasePaint); canvas.drawBitmap(eraseBg, 0, 0, null); diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index 3329901c6..9be3134c1 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -178,7 +178,7 @@ class DeviceProfile { // Hotseat hotseatIconSize = invDistWeightedInterpolate(minWidth, minHeight, points); hotseatIconSizePx = DynamicGrid.pxFromDp(hotseatIconSize, dm); - hotseatAllAppsRank = (int) (numColumns / 2); + hotseatAllAppsRank = (int) Math.ceil(numColumns / 2); // Calculate other vars based on Configuration updateFromConfiguration(resources, wPx, hPx, awPx, ahPx); @@ -543,7 +543,7 @@ public class DynamicGrid { // The tablet profile is odd in that the landscape orientation // also includes the nav bar on the side deviceProfiles.add(new DeviceProfile("Nexus 7", - 575, 904, 6, 6, (useLargeIcons ? 72 : 60), 14.4f, 7, (useLargeIcons ? 60 : 52))); + 575, 904, 5, 5, (useLargeIcons ? 72 : 60), 14.4f, 7, (useLargeIcons ? 60 : 52))); // Larger tablet profiles always have system bars on the top & bottom deviceProfiles.add(new DeviceProfile("Nexus 10", 727, 1207, 5, 8, (useLargeIcons ? 80 : 64), 14.4f, 9, (useLargeIcons ? 64 : 56))); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index b07943019..04b0babe6 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2127,6 +2127,10 @@ public class Launcher extends Activity return false; } + void enterAllAppsOverviewMode() { + mAppsCustomizeContent.enterOverviewMode(); + } + @Override public boolean onSearchRequested() { startSearch(null, false, null, true); @@ -2348,6 +2352,9 @@ public class Launcher extends Activity @Override public void onBackPressed() { if (isAllAppsVisible()) { + if (isClingsEnabled()) { + dismissAllAppsCling(null); + } if (mAppsCustomizeContent.isInOverviewMode()) { mAppsCustomizeContent.exitOverviewMode(true); } else { @@ -3056,6 +3063,23 @@ public class Launcher extends Activity AppsCustomizePagedView.ContentType contentType = mAppsCustomizeContent.getContentType(); showAppsCustomizeHelper(animated, springLoaded, contentType); } + + public void showAllAppsCling() { + if (isClingsEnabled() && + !mSharedPrefs.getBoolean(Cling.ALL_APPS_CLING_DISMISSED_KEY, false) && + !skipCustomClingIfNoAccounts() ) { + Cling cling = (Cling) findViewById(R.id.all_apps_cling); + View pageIndicator = mAppsCustomizeLayout.findViewById(R.id.page_indicator); + cling.setPunchThroughForView(pageIndicator); + if (cling != null) { + cling.bringToFront(); + } + initCling(R.id.all_apps_cling, 0, true, true); + } else { + removeCling(R.id.all_apps_cling); + } + } + private void showAppsCustomizeHelper(final boolean animated, final boolean springLoaded, final AppsCustomizePagedView.ContentType contentType) { if (mStateAnimation != null) { @@ -3135,6 +3159,10 @@ public class Launcher extends Activity if (mSearchDropTargetBar != null) { mSearchDropTargetBar.hideSearchBar(false); } + + if (contentType == AppsCustomizePagedView.ContentType.Applications) { + showAllAppsCling(); + } } }); @@ -4613,6 +4641,11 @@ public class Launcher extends Activity dismissCling(cling, null, Cling.FOLDER_CLING_DISMISSED_KEY, DISMISS_CLING_DURATION, true); } + public void dismissAllAppsCling(View v) { + Cling cling = (Cling) findViewById(R.id.all_apps_cling); + dismissCling(cling, null, Cling.ALL_APPS_CLING_DISMISSED_KEY, + DISMISS_CLING_DURATION, true); + } /** * To avoid managing preference change listeners for various parts of the diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index ee808df63..c6ef2b7bf 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1321,7 +1321,7 @@ public class LauncherModel extends BroadcastReceiver { + item.cellY + ") occupied by " + occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT) [(int) item.screenId][0]); - if (occupied.get(LauncherSettings.Favorites.CONTAINER_HOTSEAT) + if (occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT) [(int) item.screenId][0].itemType == LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS) { deleteOnItemOverlap.set(true); } diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java index 1dd4db7e4..d1c616028 100644 --- a/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/src/com/android/launcher3/WallpaperPickerActivity.java @@ -494,12 +494,14 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, MediaStore.Images.ImageColumns.DATE_TAKEN + " DESC LIMIT 1"); Bitmap thumb = null; - if (cursor.moveToNext()) { - int id = cursor.getInt(0); - thumb = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(), - id, MediaStore.Images.Thumbnails.MINI_KIND, null); + if (cursor != null) { + if (cursor.moveToFirst()) { + int id = cursor.getInt(0); + thumb = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(), + id, MediaStore.Images.Thumbnails.MINI_KIND, null); + } + cursor.close(); } - cursor.close(); return thumb; } |