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

Commit bd822508 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Deleting the WallpaperPicker code inside launcher. 

Instead linking it to the packages/apps/WallpaperPicker project

Change-Id: Ib6830b180a22c22afece01e0a4f6e94e89d6452b
parent ecd36529

Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -24,14 +24,14 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_JAVA_LIBRARIES := \

    libWallpaperPicker \

    android-support-v4 \

    android-support-v7-recyclerview



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

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

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



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

LOCAL_RESOURCE_DIR := packages/apps/WallpaperPicker/res \

    $(LOCAL_PATH)/res \

    prebuilts/sdk/current/support/v7/recyclerview/res
@@ -41,7 +41,8 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano 
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/

LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages android.support.v7.recyclerview

    --extra-packages android.support.v7.recyclerview \

    --extra-packages com.android.wallpaperpicker



LOCAL_SDK_VERSION := current

LOCAL_PACKAGE_NAME := Launcher3

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 


        <activity

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

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

            android:theme="@style/WallpaperTheme.Picker"

            android:label="@string/pick_wallpaper"

            android:icon="@mipmap/ic_launcher_wallpaper"

            android:finishOnCloseSystemDialogs="true"
@@ -105,8 +105,8 @@ 
        </activity>



        <activity

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

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

            android:name="com.android.wallpaperpicker.WallpaperCropActivity"

            android:theme="@style/WallpaperTheme"

            android:label="@string/crop_wallpaper"

            android:icon="@mipmap/ic_launcher_wallpaper"

            android:finishOnCloseSystemDialogs="true"

WallpaperPicker/AndroidManifest.xml

deleted100644 → 0
+0 −10
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="16" android:targetSdkVersion="21" />

    <application/>

</manifest>

WallpaperPicker/README

deleted100644 → 0
+0 −4
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

WallpaperPicker/res/anim/fade_out.xml

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

<!-- Copyright (C) 2014 The Android Open Source Project



 Licensed under the Apache License, Version 2.0 (the "License");

 you may not use this file except in compliance with the License.

 You may obtain a copy of the License at



      http://www.apache.org/licenses/LICENSE-2.0



 Unless required by applicable law or agreed to in writing, software

 distributed under the License is distributed on an "AS IS" BASIS,

 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 See the License for the specific language governing permissions and

 limitations under the License.

-->



<!-- startOffset is the same as the duration of the wallpaper_enter animation. We have this delay so

    that we don't see the wallpaper changing before fading back to the home screen. -->

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

    android:startOffset="@android:integer/config_longAnimTime"

    android:duration="@android:integer/config_mediumAnimTime"

    android:fromAlpha="1"

    android:toAlpha="0"/>
 
 No newline at end of file