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 /Android.mk | |
| 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 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 63e85aeda..59bc8961d 100644 --- a/Android.mk +++ b/Android.mk @@ -44,6 +44,7 @@ LOCAL_PACKAGE_NAME := Launcher3 LOCAL_OVERRIDES_PACKAGES := Launcher2 LOCAL_PROGUARD_FLAG_FILES := proguard.flags +LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE) |