openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Split out launcherProtos from sysui_shared.jar 

Bug: 113043444
Change-Id: I3115cdc7871b0f77601e399df01cdde0dde87c6e
This commit is contained in:
Hyunyoung Song 2018-11-05 14:45:19 -08:00
parent fc00747909
commit 0ae3888ad1
5 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Android.mk
View File

@ -37,6 +37,14 @@ LOCAL_UNINSTALLABLE_MODULE := true
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := libLauncherProtos
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_SRC_FILES := libs/launcher_protos.jar
LOCAL_UNINSTALLABLE_MODULE := true
LOCAL_SDK_VERSION := current
include $(BUILD_PREBUILT)
# #
# Build rule for plugin lib (needed to write a plugin). # Build rule for plugin lib (needed to write a plugin).
# #
@ -160,10 +168,10 @@ LOCAL_AAPT2_ONLY := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
ifneq (,$(wildcard frameworks/base)) ifneq (,$(wildcard frameworks/base))
LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PRIVATE_PLATFORM_APIS := true
else else
LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos
LOCAL_SDK_VERSION := system_current LOCAL_SDK_VERSION := system_current
LOCAL_MIN_SDK_VERSION := 26 LOCAL_MIN_SDK_VERSION := 26
endif endif
@ -223,10 +231,10 @@ LOCAL_USE_AAPT2 := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
ifneq (,$(wildcard frameworks/base)) ifneq (,$(wildcard frameworks/base))
LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PRIVATE_PLATFORM_APIS := true
else else
LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos
LOCAL_SDK_VERSION := system_current LOCAL_SDK_VERSION := system_current
LOCAL_MIN_SDK_VERSION := 26 LOCAL_MIN_SDK_VERSION := 26
endif endif

8
libs/README.txt Normal file
View File

@ -0,0 +1,8 @@
These jar are compiled in the frameworks/base of the platform tree.
launcher_protos.jar is defined as launcherprotosnano in the following file:
frameworks/base/core/protos/android/stats/launcher/Android.bp
plugin_core.jar is defined as PluginCoreLib in the following file:
frameworks/base/packages/SystemUI/plugin/Android.bp

BIN
libs/launcher_protos.jar Normal file
View File

Binary file not shown.

BIN
quickstep/libs/sysui_shared.jar
View File

Binary file not shown.

2
src/com/android/launcher3/Launcher.java
View File

@ -1617,7 +1617,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
} else if (mStateManager.getState() == LauncherState.OVERVIEW) { } else if (mStateManager.getState() == LauncherState.OVERVIEW) {
return StatsLogUtils.LAUNCHER_STATE_OVERVIEW; return StatsLogUtils.LAUNCHER_STATE_OVERVIEW;
} }
return StatsLogUtils.LAUNCHER_STATE_BACKGROUND; return StatsLogUtils.LAUNCHER_STATE_HOME;
} }
@Override @Override