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

Commit 896b9cfc authored by Michael Jurka's avatar Michael Jurka Committed by Android Git Automerger
Browse files

am 7ad868b8: Create separate project for Wallpaper Picker 

* commit '7ad868b8':
  Create separate project for Wallpaper Picker
parents 19f7dcd5 7ad868b8

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 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, wallpaper_picker_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)/wallpaper_picker_res $(LOCAL_PATH)/res

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



LOCAL_AAPT_FLAGS := --auto-add-overlay

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,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"

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