diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | AndroidManifest.xml | 27 | ||||
| -rw-r--r-- | build.gradle | 1 | ||||
| -rw-r--r-- | settings.gradle | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 | ||||
| -rw-r--r-- | src/com/android/launcher3/WallpaperPickerActivity.java | 114 |
6 files changed, 2 insertions, 154 deletions
diff --git a/Android.mk b/Android.mk index e42a4632d..bddcfaff2 100644 --- a/Android.mk +++ b/Android.mk @@ -24,7 +24,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := \ - libWallpaperPicker \ android-support-v4 \ android-support-v7-recyclerview \ android-support-v7-palette @@ -32,7 +31,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-proto-files-under, protos) -LOCAL_RESOURCE_DIR := packages/apps/WallpaperPicker/res \ +LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ prebuilts/sdk/current/support/v7/recyclerview/res @@ -43,7 +42,6 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ --extra-packages android.support.v7.recyclerview \ - --extra-packages com.android.wallpaperpicker LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := Launcher3 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 80ffa43dc..09086f9b6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -92,33 +92,6 @@ </activity> <activity - android:name="com.android.launcher3.WallpaperPickerActivity" - android:theme="@style/WallpaperTheme.Picker" - android:label="@string/pick_wallpaper" - android:icon="@mipmap/ic_launcher_wallpaper" - android:finishOnCloseSystemDialogs="true" - android:process=":wallpaper_chooser"> - <intent-filter> - <action android:name="android.intent.action.SET_WALLPAPER" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - </activity> - - <activity - android:name="com.android.wallpaperpicker.WallpaperCropActivity" - android:theme="@style/WallpaperTheme" - android:label="@string/crop_wallpaper" - android:icon="@mipmap/ic_launcher_wallpaper" - android:finishOnCloseSystemDialogs="true" - android:process=":wallpaper_chooser"> - <intent-filter> - <action android:name="android.service.wallpaper.CROP_AND_SET_WALLPAPER" /> - <category android:name="android.intent.category.DEFAULT" /> - <data android:mimeType="image/*" /> - </intent-filter> - </activity> - - <activity android:name="com.android.launcher3.SettingsActivity" android:label="@string/settings_button_text" android:autoRemoveFromRecents="true" diff --git a/build.gradle b/build.gradle index 19561783d..4df406363 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,6 @@ dependencies { compile 'com.android.support:recyclerview-v7:23.1.1' compile 'com.android.support:palette-v7:23.2.0' compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-2' - compile project(":WallpaperPicker-Lib") testCompile 'junit:junit:4.12' androidTestCompile 'com.android.support.test:runner:0.5' diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 2cbf914a4..000000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -include ':WallpaperPicker-Lib' -project(':WallpaperPicker-Lib').projectDir = new File(rootDir, '../WallpaperPicker')
\ No newline at end of file diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ccab1a31d..d2d07cc5a 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2759,13 +2759,7 @@ public class Launcher extends Activity if (LOGD) Log.d(TAG, "onClickWallpaperPicker"); int pageScroll = mWorkspace.getScrollForPage(mWorkspace.getPageNearestToCenterOfScreen()); float offset = mWorkspace.mWallpaperOffset.wallpaperOffsetForScroll(pageScroll); - startActivityForResult(new Intent(Intent.ACTION_SET_WALLPAPER).setPackage(getPackageName()) - .putExtra(Utilities.EXTRA_WALLPAPER_OFFSET, offset), - REQUEST_PICK_WALLPAPER); - - if (mLauncherCallbacks != null) { - mLauncherCallbacks.onClickWallpaperPicker(v); - } + // TODO: Start the system wallpaper picker } /** diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java deleted file mode 100644 index 62b9be43e..000000000 --- a/src/com/android/launcher3/WallpaperPickerActivity.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2016 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. - */ - -package com.android.launcher3; - -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.drawable.BitmapDrawable; -import android.os.Bundle; -import android.util.Pair; - -import com.android.wallpaperpicker.tileinfo.DefaultWallpaperInfo; -import com.android.wallpaperpicker.tileinfo.FileWallpaperInfo; -import com.android.wallpaperpicker.tileinfo.WallpaperTileInfo; - -import java.io.File; -import java.util.ArrayList; - -public class WallpaperPickerActivity extends com.android.wallpaperpicker.WallpaperPickerActivity { - - @Override - public void startActivityForResultSafely(Intent intent, int requestCode) { - Utilities.startActivityForResultSafely(this, intent, requestCode); - } - - @Override - public boolean enableRotation() { - return super.enableRotation() || - getContentResolver().call(LauncherSettings.Settings.CONTENT_URI, - LauncherSettings.Settings.METHOD_GET_BOOLEAN, - Utilities.ALLOW_ROTATION_PREFERENCE_KEY, new Bundle()) - .getBoolean(LauncherSettings.Settings.EXTRA_VALUE); - } - - @Override - public ArrayList<WallpaperTileInfo> findBundledWallpapers() { - final PackageManager pm = getPackageManager(); - final ArrayList<WallpaperTileInfo> bundled = new ArrayList<WallpaperTileInfo>(24); - - Partner partner = Partner.get(pm); - if (partner != null) { - final Resources partnerRes = partner.getResources(); - final int resId = partnerRes.getIdentifier(Partner.RES_WALLPAPERS, "array", - partner.getPackageName()); - if (resId != 0) { - addWallpapers(bundled, partnerRes, partner.getPackageName(), resId); - } - - // Add system wallpapers - File systemDir = partner.getWallpaperDirectory(); - if (systemDir != null && systemDir.isDirectory()) { - for (File file : systemDir.listFiles()) { - if (!file.isFile()) { - continue; - } - String name = file.getName(); - int dotPos = name.lastIndexOf('.'); - String extension = ""; - if (dotPos >= -1) { - extension = name.substring(dotPos); - name = name.substring(0, dotPos); - } - - if (name.endsWith("_small")) { - // it is a thumbnail - continue; - } - - File thumbnail = new File(systemDir, name + "_small" + extension); - Bitmap thumb = BitmapFactory.decodeFile(thumbnail.getAbsolutePath()); - if (thumb != null) { - bundled.add(new FileWallpaperInfo( - file, new BitmapDrawable(getResources(), thumb))); - } - } - } - } - - Pair<ApplicationInfo, Integer> r = getWallpaperArrayResourceId(); - if (r != null) { - try { - Resources wallpaperRes = pm.getResourcesForApplication(r.first); - addWallpapers(bundled, wallpaperRes, r.first.packageName, r.second); - } catch (PackageManager.NameNotFoundException e) { - } - } - - if (partner == null || !partner.hideDefaultWallpaper()) { - // Add an entry for the default wallpaper (stored in system resources) - WallpaperTileInfo defaultWallpaperInfo = DefaultWallpaperInfo.get(this); - if (defaultWallpaperInfo != null) { - bundled.add(0, defaultWallpaperInfo); - } - } - return bundled; - } -} |