PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Change the way 2D/3D AllApps are selected."

Browse Source
This commit is contained in:
Daniel Sandler
2010-03-05 05:47:27 -08:00
committed by Android (Google) Code Review
parent 406d703fad 46e47d03b3
commit 8101bfa965
3 changed files with 92 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout/all_apps.xml
+4 -17
View File
@@ -14,20 +14,7 @@
limitations under the License.
-->
<!-- Replace with AllAppsView to use 2D version -->
<com.android.launcher2.AllApps3D
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/all_apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarStyle="outsideInset"
android:drawSelectorOnTop="false"
android:listSelector="@drawable/grid_selector"
android:verticalSpacing="10dip"
android:numColumns="4"
android:fadingEdgeLength="20dip"
android:padding="2dip"
android:cacheColorHint="#FF000000"
/>
<!-- switch to all_apps_3d on devices that support RenderScript -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<include layout="@layout/all_apps_2d" />
</merge>
res/layout/all_apps_2d.xml
+55
View File
@@ -0,0 +1,55 @@
<?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.
-->
<!-- Sapphire gets 2D all apps view -->
<com.android.launcher2.AllApps2D
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/all_apps_view"
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="48dip"
android:cacheColorHint="#FF000000"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_marginBottom="24dip"
android:layout_marginTop="8dip"
android:nextFocusDown="@+id/all_apps_2d_home"
/>
<ImageButton android:id="@+id/all_apps_2d_home"
android:tag="all_apps_2d_home"
android:src="@drawable/home_button"
android:background="#00000000"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_width="wrap_content"
android:layout_height="64dip"
android:nextFocusUp="@+id/all_apps_2d_grid"
/>
</com.android.launcher2.AllApps2D>
res/layout/all_apps_3d.xml
+33
View File
@@ -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.
-->
<!-- Replace with AllAppsView to use 2D version -->
<com.android.launcher2.AllApps3D
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/all_apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarStyle="outsideInset"
android:drawSelectorOnTop="false"
android:listSelector="@drawable/grid_selector"
android:verticalSpacing="10dip"
android:numColumns="4"
android:fadingEdgeLength="20dip"
android:padding="2dip"
android:cacheColorHint="#FF000000"
/>