diff options
| author | Nebojsa Cvetkovic <nebkat@gmail.com> | 2014-11-10 10:35:00 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:56 -0800 |
| commit | 3ada0966559cd9fee535a40686e049cd0d6f15c0 (patch) | |
| tree | 0b06557595d3c49e1ff826ffa2053824c3dc2031 /res/layout-port/launcher.xml | |
| parent | 0daed36da7dab3172f05aa3dc29b7facac01ce6e (diff) | |
| download | android_packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.gz android_packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.bz2 android_packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.zip | |
PagedView: Transition Effects
Conflicts:
res/layout/overview_panel.xml
res/values/cm_arrays.xml
res/values/cm_strings.xml
res/values/dimens.xml
res/values/preferences_defaults.xml
src/com/android/launcher3/AppsCustomizePagedView.java
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/PagedView.java
src/com/android/launcher3/Workspace.java
src/com/android/launcher3/settings/SettingsProvider.java
Change-Id: Ib134705952877165c334181548d577b3dceece68
Diffstat (limited to 'res/layout-port/launcher.xml')
| -rw-r--r-- | res/layout-port/launcher.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 9e98d4257..ad1027829 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -48,10 +48,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <include layout="@layout/overview_panel" - android:id="@+id/overview_panel" - android:visibility="gone" /> - <!-- Keep these behind the workspace so that they are not visible when we go into AllApps --> <include @@ -82,5 +78,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> + + <include layout="@layout/overview_panel" + android:id="@+id/overview_panel" + android:visibility="gone" /> + </com.android.launcher3.DragLayer> </FrameLayout> |