diff options
author | Patrick Dubroy <dubroy@google.com> | 2010-07-23 16:48:11 -0700 |
---|---|---|
committer | Patrick Dubroy <dubroy@google.com> | 2010-07-26 11:44:33 -0700 |
commit | 558654c6ec6eefa260e5a1c1c44fc6e13ec20473 (patch) | |
tree | 4ed4ab99fccf8dd1a68c91f186d815c030c86a81 /res | |
parent | 401d892f4cfde9285ae3e48dd6079d281454dcbb (diff) | |
download | android_packages_apps_Trebuchet-558654c6ec6eefa260e5a1c1c44fc6e13ec20473.tar.gz android_packages_apps_Trebuchet-558654c6ec6eefa260e5a1c1c44fc6e13ec20473.tar.bz2 android_packages_apps_Trebuchet-558654c6ec6eefa260e5a1c1c44fc6e13ec20473.zip |
Switched to tabbed version of AllApps2D on xlarge screens.
- add a temporary new zoom animation for all apps
- modify AllApps2D to allow it to be transparent
- other changes to dismiss the customization drawer when appropriate
Change-Id: I5660ab77f256ded299c1721c589983a1b30d56a4
Diffstat (limited to 'res')
-rw-r--r-- | res/anim/all_apps_zoom_in.xml | 33 | ||||
-rw-r--r-- | res/anim/all_apps_zoom_out.xml | 33 | ||||
-rw-r--r-- | res/layout-land/all_apps_2d.xml | 2 | ||||
-rw-r--r-- | res/layout-port/all_apps_2d.xml | 2 | ||||
-rw-r--r-- | res/layout-xlarge/all_apps_tabbed.xml | 56 | ||||
-rw-r--r-- | res/layout-xlarge/launcher.xml | 73 |
6 files changed, 162 insertions, 37 deletions
diff --git a/res/anim/all_apps_zoom_in.xml b/res/anim/all_apps_zoom_in.xml new file mode 100644 index 000000000..644d1cf4a --- /dev/null +++ b/res/anim/all_apps_zoom_in.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:anim/decelerate_interpolator" + android:shareInterpolator="true"> + <translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromXDelta="0%p" + android:toXDelta="0%p" + android:fromYDelta="-20%p" + android:toYDelta="0%p" + android:duration="500" /> + <scale + android:fromXScale="5.0" + android:toXScale="1.0" + android:fromYScale="5.0" + android:toYScale="1.0" + android:pivotX="50%" + android:pivotY="100%" + android:duration="500" /> +</set> diff --git a/res/anim/all_apps_zoom_out.xml b/res/anim/all_apps_zoom_out.xml new file mode 100644 index 000000000..23a8712e0 --- /dev/null +++ b/res/anim/all_apps_zoom_out.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:anim/accelerate_interpolator" + android:shareInterpolator="true"> + <translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromXDelta="0%p" + android:toXDelta="0%p" + android:fromYDelta="0%p" + android:toYDelta="-20%p" + android:duration="500" /> + <scale + android:fromXScale="1.0" + android:toXScale="5.0" + android:fromYScale="1.0" + android:toYScale="5.0" + android:pivotX="50%" + android:pivotY="100%" + android:duration="500" /> +</set> diff --git a/res/layout-land/all_apps_2d.xml b/res/layout-land/all_apps_2d.xml index a253b937b..b7fcd4585 100644 --- a/res/layout-land/all_apps_2d.xml +++ b/res/layout-land/all_apps_2d.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:padding="2dip" - > + android:background="#FF000000"> <GridView android:id="@+id/all_apps_2d_grid" android:tag="all_apps_2d_grid" diff --git a/res/layout-port/all_apps_2d.xml b/res/layout-port/all_apps_2d.xml index 0607d62cc..081cba292 100644 --- a/res/layout-port/all_apps_2d.xml +++ b/res/layout-port/all_apps_2d.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:padding="2dip" - > + android:background="#FF000000"> <GridView android:id="@+id/all_apps_2d_grid" android:tag="all_apps_2d_grid" diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml new file mode 100644 index 000000000..a5f3d6ff2 --- /dev/null +++ b/res/layout-xlarge/all_apps_tabbed.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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.launcher2.AllAppsTabbed xmlns:android="http://schemas.android.com/apk/res/android"> + <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:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.android.launcher2.AllApps2D + android:id="@+id/all_apps_2d" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="2dip"> + <GridView android:id="@+id/all_apps_2d_grid" + android:tag="all_apps_2d_grid" + android:scrollbars="none" + android:drawSelectorOnTop="false" + android:listSelector="@drawable/grid_selector" + android:verticalSpacing="10dip" + android:numColumns="4" + android:fadingEdgeLength="0dip" + android:cacheColorHint="#00000000" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_alignParentBottom="true" + android:layout_marginBottom="@dimen/button_bar_height" + android:layout_marginTop="8dip" + android:nextFocusDown="@+id/all_apps_2d_home" + android:nextFocusUp="@null" + android:nextFocusLeft="@null" + android:nextFocusRight="@null" /> + </com.android.launcher2.AllApps2D> + </FrameLayout> + </LinearLayout> +</com.android.launcher2.AllAppsTabbed> diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml index 72cd7962f..61457bf0f 100644 --- a/res/layout-xlarge/launcher.xml +++ b/res/layout-xlarge/launcher.xml @@ -22,7 +22,12 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/all_apps" /> + <include + layout="@layout/all_apps_tabbed" + android:id="@+id/all_apps_view" + android:layout_width="match_parent" + android:layout_height="500dip" + android:layout_gravity="top"/> <!-- The workspace contains 5 screens of cells --> <com.android.launcher2.Workspace @@ -39,8 +44,6 @@ <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> </com.android.launcher2.Workspace> - - <RelativeLayout android:id="@+id/all_apps_button_cluster" android:layout_width="wrap_content" @@ -86,37 +89,37 @@ android:layout_height="200dip" android:layout_gravity="bottom" 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> + <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> |