Improving home screen customization
- Created a drawer with tabs for widgets, folders, shortcuts, wallpapers
(wallpapers are currently not implemented)
- Tapping outside the drawer dismisses it
- Moved the all apps icon to the upper right of the screen
- Adding a toast that says "No more space on screen" when dragging a widget to a full screen
- Fixed bug where you could stack two equal-sized widgets on top of each other on the homescreen (exposed by the new ability to drag widgets onto the home screen)
Change-Id: I03b65ce54a85d24328c94e0c06e249571de449ee
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 17a5b84..ce864c2 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -39,54 +39,83 @@
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
</com.android.launcher2.Workspace>
- <com.android.launcher2.DeleteZone
- android:id="@+id/delete_zone"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/delete_zone_padding"
- android:layout_gravity="top|right"
- android:scaleType="center"
- android:src="@drawable/delete_zone_selector"
- android:visibility="gone"
- launcher:direction="horizontal"
- />
- <ImageView
- android:id="@+id/add_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/delete_zone_padding"
- android:layout_gravity="top|right"
-
- android:scaleType="center"
- android:src="@drawable/add_button"
-
- android:onClick="onClickAddButton"
- android:focusable="true"
- android:clickable="true" />
<RelativeLayout
android:id="@+id/all_apps_button_cluster"
- android:layout_width="@dimen/button_bar_height"
- android:layout_height="@dimen/button_bar_height"
- android:layout_gravity="top|left"
- android:paddingTop="2dip"
- >
- <com.android.launcher2.HandleView
- style="@style/HotseatButton"
- android:id="@+id/all_apps_button"
- android:layout_centerHorizontal="true"
- android:layout_alignParentBottom="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top|right">
+ <com.android.launcher2.HandleView
+ style="@style/HotseatButton"
+ android:id="@+id/all_apps_button"
+ android:layout_width="@dimen/button_bar_height"
- android:src="@drawable/all_apps_button"
- launcher:direction="horizontal"
- />
+ android:src="@drawable/all_apps_button"
+ launcher:direction="horizontal" />
+ <ImageView
+ android:id="@+id/add_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/all_apps_button"
+
+ android:layout_centerVertical="true"
+ android:scaleType="center"
+ android:src="@drawable/add_button"
+
+ android:onClick="onClickAddButton"
+ android:focusable="true"
+ android:clickable="true" />
+ <com.android.launcher2.DeleteZone
+ android:id="@+id/delete_zone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/delete_zone_padding"
+ android:layout_toRightOf="@id/all_apps_button"
+
+ android:scaleType="center"
+ android:src="@drawable/delete_zone_selector"
+ android:visibility="gone"
+ launcher:direction="horizontal" />
</RelativeLayout>
- <com.android.launcher2.WidgetChooser
- android:id="@+id/widget_chooser"
+
+ <TabHost
+ android:id="@android:id/tabhost"
android:layout_width="match_parent"
- android:layout_height="100dip"
+ android:layout_height="200dip"
android:layout_gravity="bottom"
- android:visibility="gone"
- />
+ android:visibility="gone">
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ <FrameLayout
+ android:id="@android:id/tabcontent"
+ android:background="#ff000000"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <com.android.launcher2.WidgetChooser
+ android:id="@+id/widget_chooser"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <com.android.launcher2.FolderChooser
+ android:id="@+id/folder_chooser"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <com.android.launcher2.ShortcutChooser
+ android:id="@+id/shortcut_chooser"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <TextView
+ android:id="@+id/wallpaperstab"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="@string/wallpapers_temp_tab_text" />
+ </FrameLayout>
+ </LinearLayout>
+ </TabHost>
</com.android.launcher2.DragLayer>