Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 381fa3fb authored by Adam Skory's avatar Adam Skory
Browse files

Merge remote-tracking branch 'goog/ub-now-lunchbox' into release

parents 5339119b e68504f4

Android.mk

+27 −1
Original line number Diff line number Diff line
@@ -26,8 +26,12 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13



LOCAL_SRC_FILES := $(call all-java-files-under, src) \

    $(call all-java-files-under, WallpaperPicker/src) \

    $(call all-renderscript-files-under, src) \

    $(call all-proto-files-under, protos)

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res $(LOCAL_PATH)/res



LOCAL_AAPT_FLAGS := --auto-add-overlay



LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
@@ -57,6 +61,28 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano 
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/



LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := protoutil

LOCAL_MODULE := launcher_protoutil_lib

LOCAL_IS_HOST_MODULE := true

LOCAL_JAR_MANIFEST := util/etc/manifest.txt

LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-2.3.0-nano



include $(BUILD_HOST_JAVA_LIBRARY)



#

# Protocol Buffer Debug Utility Wrapper Script

#

include $(CLEAR_VARS)

LOCAL_IS_HOST_MODULE := true

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := launcher_protoutil



include $(BUILD_SYSTEM)/base_rules.mk



$(LOCAL_BUILT_MODULE): launcher_protoutil_lib

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP)

	@echo "Copy: $(PRIVATE_MODULE) ($@)"

	$(copy-file-to-new-target)

	$(hide) chmod 755 $@



INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)

AndroidManifest.xml

+9 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="19" android:minSdkVersion="16"/>



    <permission

        android:name="com.android.launcher3.permission.PRELOAD_WORKSPACE"
@@ -104,7 +105,7 @@ 
        </activity>



        <activity

            android:name="com.android.launcher3.WallpaperPickerActivity"

            android:name="com.android.launcher3.LauncherWallpaperPickerActivity"

            android:theme="@style/Theme.WallpaperCropper"

            android:label="@string/pick_wallpaper"

            android:icon="@mipmap/ic_launcher_wallpaper"
@@ -160,6 +161,13 @@ 
            </intent-filter>

        </receiver>



        <receiver

            android:name="com.android.launcher3.WallpaperChangedReceiver">

            <intent-filter>

                <action android:name="android.intent.action.WALLPAPER_CHANGED" />

            </intent-filter>

        </receiver>



        <!-- Intent received used to install shortcuts from other applications -->

        <receiver

            android:name="com.android.launcher3.InstallShortcutReceiver"

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

WallpaperPicker/AndroidManifest.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.launcher3"

        android:versionCode="1"

        android:versionName="1.0"

        >



    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" />



</manifest>

WallpaperPicker/README

0 → 100644
+4 −0
Original line number Diff line number Diff line 
This project contains the wallpaper picker for Launcher3. It's in a separate

folder to organize the code separately from the rest of the launcher, and has

a manifest so that a separate Eclipse project can exist for the wallpaper

picker (necessary to have the Eclipse build work)
 
 No newline at end of file