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/overview_panel.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/overview_panel.xml')
| -rw-r--r-- | res/layout/overview_panel.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index ea12aefe4..8fed47718 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -22,7 +22,6 @@ android:gravity="bottom" slidingpanel:overlay="false" slidingpanel:panelHeight="@dimen/sliding_panel_padding" > - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/default_home_screen_panel" |