From 29c2da02bf48fbdba977bc774027e218487e1abe Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Thu, 24 Apr 2014 22:24:07 -0700 Subject: Trebuchet: add lockscreen wallpaper picker Change-Id: Ic4f2589924a3c61b676db907f08108286dc45c29 Signed-off-by: Roman Birg --- Android.mk | 2 +- AndroidManifest.xml | 14 + res/drawable-hdpi/ic_clear.png | Bin 0 -> 501 bytes res/drawable-mdpi/ic_clear.png | Bin 0 -> 329 bytes res/drawable-xhdpi/ic_clear.png | Bin 0 -> 611 bytes res/drawable-xxhdpi/ic_clear.png | Bin 0 -> 1102 bytes res/layout/wallpaper_picker_clear.xml | 42 + res/values/cm_strings.xml | 3 + src/android/util/Pools.java | 165 -- src/com/android/launcher3/DragLayer.java | 3 +- .../launcher3/LiveWallpaperListAdapter.java | 2 +- .../launcher3/LockWallpaperPickerActivity.java | 1600 ++++++++++++++++++++ .../android/launcher3/SavedWallpaperImages.java | 8 +- .../ThirdPartyWallpaperPickerListAdapter.java | 2 +- .../android/launcher3/WallpaperCropActivity.java | 46 +- .../android/launcher3/WallpaperPickerActivity.java | 40 +- src/com/android/launcher3/WallpaperRootView.java | 6 +- src/com/android/photos/BitmapRegionTileSource.java | 44 +- 18 files changed, 1761 insertions(+), 216 deletions(-) create mode 100644 res/drawable-hdpi/ic_clear.png create mode 100644 res/drawable-mdpi/ic_clear.png create mode 100644 res/drawable-xhdpi/ic_clear.png create mode 100644 res/drawable-xxhdpi/ic_clear.png create mode 100644 res/layout/wallpaper_picker_clear.xml delete mode 100644 src/android/util/Pools.java create mode 100644 src/com/android/launcher3/LockWallpaperPickerActivity.java diff --git a/Android.mk b/Android.mk index 0fd1ff77f..f5bdaca84 100644 --- a/Android.mk +++ b/Android.mk @@ -32,7 +32,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PROTOC_OPTIMIZE_TYPE := nano LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ -LOCAL_SDK_VERSION := 19 +#LOCAL_SDK_VERSION := 19 LOCAL_PACKAGE_NAME := Trebuchet LOCAL_PRIVILEGED_MODULE := true diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f8ef64f31..95e6f7fb9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -52,6 +52,7 @@ + @@ -116,6 +117,19 @@ + + + + + + + + + + + + + diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 7f5de470f..d4effcc40 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -86,6 +86,9 @@ Google + + Clear + Customize your drawer diff --git a/src/android/util/Pools.java b/src/android/util/Pools.java deleted file mode 100644 index 40bab1eae..000000000 --- a/src/android/util/Pools.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (C) 2009 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 android.util; - -/** - * Helper class for crating pools of objects. An example use looks like this: - * 
- * public class MyPooledClass {
- *
- *     private static final SynchronizedPool sPool =
- *             new SynchronizedPool(10);
- *
- *     public static MyPooledClass obtain() {
- *         MyPooledClass instance = sPool.acquire();
- *         return (instance != null) ? instance : new MyPooledClass();
- *     }
- *
- *     public void recycle() {
- *          // Clear state if needed.
- *          sPool.release(this);
- *     }
- *
- *     . . .
- * }
- *
- * - * @hide - */ -public final class Pools { - - /** - * Interface for managing a pool of objects. - * - * @param The pooled type. - */ - public static interface Pool { - - /** - * @return An instance from the pool if such, null otherwise. - */ - public T acquire(); - - /** - * Release an instance to the pool. - * - * @param instance The instance to release. - * @return Whether the instance was put in the pool. - * - * @throws IllegalStateException If the instance is already in the pool. - */ - public boolean release(T instance); - } - - private Pools() { - /* do nothing - hiding constructor */ - } - - /** - * Simple (non-synchronized) pool of objects. - * - * @param The pooled type. - */ - public static class SimplePool implements Pool { - private final Object[] mPool; - - private int mPoolSize; - - /** - * Creates a new instance. - * - * @param maxPoolSize The max pool size. - * - * @throws IllegalArgumentException If the max pool size is less than zero. - */ - public SimplePool(int maxPoolSize) { - if (maxPoolSize <= 0) { - throw new IllegalArgumentException("The max pool size must be > 0"); - } - mPool = new Object[maxPoolSize]; - } - - @Override - @SuppressWarnings("unchecked") - public T acquire() { - if (mPoolSize > 0) { - final int lastPooledIndex = mPoolSize - 1; - T instance = (T) mPool[lastPooledIndex]; - mPool[lastPooledIndex] = null; - mPoolSize--; - return instance; - } - return null; - } - - @Override - public boolean release(T instance) { - if (isInPool(instance)) { - throw new IllegalStateException("Already in the pool!"); - } - if (mPoolSize < mPool.length) { - mPool[mPoolSize] = instance; - mPoolSize++; - return true; - } - return false; - } - - private boolean isInPool(T instance) { - for (int i = 0; i < mPoolSize; i++) { - if (mPool[i] == instance) { - return true; - } - } - return false; - } - } - - /** - * Synchronized) pool of objects. - * - * @param The pooled type. - */ - public static class SynchronizedPool extends SimplePool { - private final Object mLock = new Object(); - - /** - * Creates a new instance. - * - * @param maxPoolSize The max pool size. - * - * @throws IllegalArgumentException If the max pool size is less than zero. - */ - public SynchronizedPool(int maxPoolSize) { - super(maxPoolSize); - } - - @Override - public T acquire() { - synchronized (mLock) { - return super.acquire(); - } - } - - @Override - public boolean release(T element) { - synchronized (mLock) { - return super.release(element); - } - } - } -} \ No newline at end of file diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 89f8275bf..401f4ed52 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -800,7 +800,8 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang /** * Note: this is a reimplementation of View.isLayoutRtl() since that is currently hidden api. */ - private boolean isLayoutRtl() { + @Override + public boolean isLayoutRtl() { return (getLayoutDirection() == LAYOUT_DIRECTION_RTL); } diff --git a/src/com/android/launcher3/LiveWallpaperListAdapter.java b/src/com/android/launcher3/LiveWallpaperListAdapter.java index 54e0af749..43d8cfe0c 100644 --- a/src/com/android/launcher3/LiveWallpaperListAdapter.java +++ b/src/com/android/launcher3/LiveWallpaperListAdapter.java @@ -118,7 +118,7 @@ public class LiveWallpaperListAdapter extends BaseAdapter implements ListAdapter mInfo = info; } @Override - public void onClick(WallpaperPickerActivity a) { + public void onClick(WallpaperCropActivity a) { Intent preview = new Intent(WallpaperManager.ACTION_CHANGE_LIVE_WALLPAPER); preview.putExtra(WallpaperManager.EXTRA_LIVE_WALLPAPER_COMPONENT, mInfo.getComponent()); diff --git a/src/com/android/launcher3/LockWallpaperPickerActivity.java b/src/com/android/launcher3/LockWallpaperPickerActivity.java new file mode 100644 index 000000000..483568480 --- /dev/null +++ b/src/com/android/launcher3/LockWallpaperPickerActivity.java @@ -0,0 +1,1600 @@ +/* + * Copyright (C) 2014 The CyanogenMod 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.animation.Animator; +import android.animation.LayoutTransition; +import android.app.ActionBar; +import android.app.Activity; +import android.app.WallpaperInfo; +import android.app.WallpaperManager; +import android.content.ContentResolver; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.res.AssetManager; +import android.content.res.Resources; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.Bitmap.CompressFormat; +import android.graphics.BitmapFactory; +import android.graphics.BitmapRegionDecoder; +import android.graphics.Canvas; +import android.graphics.Matrix; +import android.graphics.Paint; +import android.graphics.Point; +import android.graphics.PorterDuff; +import android.graphics.Rect; +import android.graphics.RectF; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.LevelListDrawable; +import android.net.Uri; +import android.os.AsyncTask; +import android.os.Bundle; +import android.provider.MediaStore; +import android.provider.ThemesContract.ThemesColumns; +import android.util.Log; +import android.util.Pair; +import android.view.ActionMode; +import android.view.Display; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.ViewGroup; +import android.view.ViewTreeObserver; +import android.view.ViewTreeObserver.OnGlobalLayoutListener; +import android.view.animation.AccelerateInterpolator; +import android.view.animation.DecelerateInterpolator; +import android.widget.BaseAdapter; +import android.widget.FrameLayout; +import android.widget.HorizontalScrollView; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.ListAdapter; + +import com.android.gallery3d.common.Utils; +import com.android.launcher3.WallpaperCropActivity.BitmapCropTask; +import com.android.launcher3.WallpaperCropActivity.OnBitmapCroppedHandler; +import com.android.photos.BitmapRegionTileSource; + +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; + +public class LockWallpaperPickerActivity extends WallpaperCropActivity { + static final String TAG = LockWallpaperPickerActivity.class.getSimpleName(); + + public static final int IMAGE_PICK = 5; + public static final int PICK_WALLPAPER_THIRD_PARTY_ACTIVITY = 6; + public static final int PICK_LIVE_WALLPAPER = 7; + private static final String TEMP_WALLPAPER_TILES = "TEMP_KEYGUARD_WALLPAPER_TILES"; + + private View mSelectedThumb; + private boolean mIgnoreNextTap; + private OnClickListener mThumbnailOnClickListener; + + private LinearLayout mWallpapersView; + private View mWallpaperStrip; + + private ActionMode.Callback mActionModeCallback; + private ActionMode mActionMode; + + private View.OnLongClickListener mLongClickListener; + + ArrayList mTempWallpaperTiles = new ArrayList(); + private SavedWallpaperImages mSavedImages; + + public static class PickImageInfo extends WallpaperTileInfo { + @Override + public void onClick(WallpaperCropActivity a) { + Intent intent = new Intent(Intent.ACTION_GET_CONTENT); + intent.setType("image/*"); + Utilities.startActivityForResultSafely(((LockWallpaperPickerActivity)a), intent, IMAGE_PICK); + } + } + + public static class UserDesktopWallpaperInfo extends WallpaperTileInfo { + @Override + public void onClick(WallpaperCropActivity a) { + WallpaperManager am = WallpaperManager.getInstance(a); + am.clearKeyguardWallpaper(); + a.setResult(RESULT_OK); + a.finish(); + } + } + + public static class UriWallpaperInfo extends WallpaperTileInfo { + private Uri mUri; + public UriWallpaperInfo(Uri uri) { + mUri = uri; + } + @Override + public void onClick(WallpaperCropActivity a) { + CropView v = a.getCropView(); + int rotation = WallpaperCropActivity.getRotationFromExif(a, mUri); + v.setTileSource(new BitmapRegionTileSource(a, mUri, 1024, rotation), null); + v.setTouchEnabled(true); + } + @Override + public void onSave(final WallpaperCropActivity a) { + boolean finishActivityWhenDone = true; + OnBitmapCroppedHandler h = new OnBitmapCroppedHandler() { + public void onBitmapCropped(byte[] imageBytes) { + Point thumbSize = getDefaultThumbnailSize(a.getResources()); + Bitmap thumb = createThumbnail( + thumbSize, null, null, imageBytes, null, 0, 0, true); + a.getSavedImages().writeImage(thumb, imageBytes); + } + }; + ((LockWallpaperPickerActivity)a).cropImageAndSetWallpaper(mUri, h, finishActivityWhenDone); + } + @Override + public boolean isSelectable() { + return true; + } + @Override + public boolean isNamelessWallpaper() { + return true; + } + } + + /** + * For themes which have regular wallpapers + */ + public static class ThemeWallpaperInfo extends WallpaperTileInfo { + String mPackageName; + boolean mIsLegacy; + Drawable mThumb; + Context mContext; + + public ThemeWallpaperInfo(Context context, String packageName, boolean legacy, Drawable thumb) { + this.mContext = context; + this.mPackageName = packageName; + this.mIsLegacy = legacy; + this.mThumb = thumb; + } + + @Override + public void onClick(WallpaperCropActivity a) { + CropView v = a.getCropView(); + try { + BitmapRegionTileSource source = null; + if (mIsLegacy) { + final PackageManager pm = a.getPackageManager(); + PackageInfo pi = pm.getPackageInfo(mPackageName, 0); + Resources res = a.getPackageManager().getResourcesForApplication(mPackageName); + int resId = pi.legacyThemeInfos[0].wallpaperResourceId; + + int rotation = WallpaperCropActivity.getRotationFromExif(res, resId); + source = new BitmapRegionTileSource( + res, a, resId, 1024, rotation); + } else { + Resources res = a.getPackageManager().getResourcesForApplication(mPackageName); + if (res == null) { + return; + } + + int rotation = 0; + source = new BitmapRegionTileSource( + res, a, "wallpapers", 1024, rotation, true); + } + v.setTileSource(source, null); + v.setTouchEnabled(true); + } catch (NameNotFoundException e) { + } + } + + @Override + public void onSave(WallpaperCropActivity a) { + ((LockWallpaperPickerActivity)a).cropImageAndSetWallpaper( + "wallpapers", + mPackageName, + mIsLegacy, + true); + } + + @Override + public boolean isNamelessWallpaper() { + return true; + } + + @Override + public boolean isSelectable() { + return true; + } + } + + /** + * For themes that have LOCKSCREEN wallpapers + */ + public static class ThemeLockWallpaperInfo extends WallpaperTileInfo { + String mPackageName; + Drawable mThumb; + Context mContext; + + public ThemeLockWallpaperInfo(Context context, String packageName, Drawable thumb) { + this.mContext = context; + this.mPackageName = packageName; + this.mThumb = thumb; + } + + @Override + public void onClick(WallpaperCropActivity a) { + CropView v = a.getCropView(); + try { + BitmapRegionTileSource source = null; + Resources res = a.getPackageManager().getResourcesForApplication(mPackageName); + if (res == null) { + return; + } + + int rotation = 0; + source = new BitmapRegionTileSource( + res, a, "lockscreen", 1024, rotation, true); + v.setTileSource(source, null); + v.setTouchEnabled(true); + } catch (NameNotFoundException e) { + } + } + + @Override + public void onSave(WallpaperCropActivity a) { + ((LockWallpaperPickerActivity)a).cropImageAndSetWallpaper( + "lockscreen", + mPackageName, + false, + true); + } + + @Override + public boolean isNamelessWallpaper() { + return true; + } + + @Override + public boolean isSelectable() { + return true; + } + } + + public static class ResourceWallpaperInfo extends WallpaperTileInfo { + private Resources mResources; + private int mResId; + private Drawable mThumb; + + public ResourceWallpaperInfo(Resources res, int resId, Drawable thumb) { + mResources = res; + mResId = resId; + mThumb = thumb; + } + @Override + public void onClick(WallpaperCropActivity a) { + int rotation = WallpaperCropActivity.getRotationFromExif(mResources, mResId); + BitmapRegionTileSource source = new BitmapRegionTileSource( + mResources, a, mResId, 1024, rotation); + CropView v = a.getCropView(); + v.setTileSource(source, null); + Point wallpaperSize = WallpaperCropActivity.getDefaultWallpaperSize( + a.getResources(), a.getWindowManager()); + RectF crop = WallpaperCropActivity.getMaxCropRect( + source.getImageWidth(), source.getImageHeight(), + wallpaperSize.x, wallpaperSize.y, false); + v.setScale(wallpaperSize.x / crop.width()); + v.setTouchEnabled(false); + } + @Override + public void onSave(WallpaperCropActivity a) { + boolean finishActivityWhenDone = true; + ((LockWallpaperPickerActivity)a).cropImageAndSetWallpaper(mResources, mResId, finishActivityWhenDone); + } + @Override + public boolean isSelectable() { + return true; + } + @Override + public boolean isNamelessWallpaper() { + return true; + } + } + + protected void cropImageAndSetWallpaper(String path, String packageName, final boolean legacy, + final boolean finishActivityWhenDone) { + + Point outSize = new Point(); + getWindowManager().getDefaultDisplay().getSize(outSize); + + final int outWidth = outSize.x; + final int outHeight = outSize.y; + Runnable onEndCrop = new Runnable() { + public void run() { + if (finishActivityWhenDone) { + setResult(Activity.RESULT_OK); + finish(); + } + } + }; + + RectF cropRect = new RectF(mCropView.getCrop()); + BitmapCropTask cropTask = null; + try { + if (legacy) { + final PackageManager pm = getPackageManager(); + PackageInfo pi = pm.getPackageInfo(packageName, 0); + Resources res = getPackageManager().getResourcesForApplication(packageName); + int resId = pi.legacyThemeInfos[0].wallpaperResourceId; + cropTask = new BitmapCropTask(this, res, resId, + cropRect, 0, outWidth, outHeight, true, false, onEndCrop); + } else { + Resources res = getPackageManager().getResourcesForApplication(packageName); + if (res == null) { + return; + } + cropTask = new BitmapCropTask(this, res, path, cropRect, + 0, outWidth, outHeight, true, false, onEndCrop); + } + } catch (NameNotFoundException e) { + return; + } + + if (cropTask != null) { + cropTask.execute(); + } + } + + @Override + protected void cropImageAndSetWallpaper(Uri uri, + OnBitmapCroppedHandler onBitmapCroppedHandler, final boolean finishActivityWhenDone) { + // Get the crop + boolean ltr = mCropView.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR; + + Point minDims = new Point(); + Point maxDims = new Point(); + Display d = getWindowManager().getDefaultDisplay(); + d.getCurrentSizeRange(minDims, maxDims); + + Point displaySize = new Point(); + d.getSize(displaySize); + + int maxDim = Math.max(maxDims.x, maxDims.y); + final int minDim = Math.min(minDims.x, minDims.y); + int defaultWallpaperWidth; + if (isScreenLarge(getResources())) { + defaultWallpaperWidth = (int) (maxDim * + wallpaperTravelToScreenWidthRatio(maxDim, minDim)); + } else { + defaultWallpaperWidth = Math.max((int) + (minDim * WALLPAPER_SCREENS_SPAN), maxDim); + } + + boolean isPortrait = displaySize.x < displaySize.y; + int portraitHeight; + if (isPortrait) { + portraitHeight = mCropView.getHeight(); + } else { + // TODO: how to actually get the proper portrait height? + // This is not quite right: + portraitHeight = Math.max(maxDims.x, maxDims.y); + } + if (android.os.Build.VERSION.SDK_INT >= + android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) { + Point realSize = new Point(); + d.getRealSize(realSize); + portraitHeight = Math.max(realSize.x, realSize.y); + } + // Get the crop + RectF cropRect = mCropView.getCrop(); + int cropRotation = mCropView.getImageRotation(); + float cropScale = mCropView.getWidth() / (float) cropRect.width(); + + Point inSize = mCropView.getSourceDimensions(); + Matrix rotateMatrix = new Matrix(); + rotateMatrix.setRotate(cropRotation); + float[] rotatedInSize = new float[] { inSize.x, inSize.y }; + rotateMatrix.mapPoints(rotatedInSize); + rotatedInSize[0] = Math.abs(rotatedInSize[0]); + rotatedInSize[1] = Math.abs(rotatedInSize[1]); + + // ADJUST CROP WIDTH + // Extend the crop all the way to the right, for parallax + // (or all the way to the left, in RTL) + float extraSpace = ltr ? rotatedInSize[0] - cropRect.right : cropRect.left; + // Cap the amount of extra width + float maxExtraSpace = defaultWallpaperWidth / cropScale - cropRect.width(); + extraSpace = Math.min(extraSpace, maxExtraSpace); + + if (ltr) { + cropRect.right += extraSpace; + } else { + cropRect.left -= extraSpace; + } + + // ADJUST CROP HEIGHT + if (isPortrait) { + cropRect.bottom = cropRect.top + portraitHeight / cropScale; + } else { // LANDSCAPE + float extraPortraitHeight = + portraitHeight / cropScale - cropRect.height(); + float expandHeight = + Math.min(Math.min(rotatedInSize[1] - cropRect.bottom, cropRect.top), + extraPortraitHeight / 2); + cropRect.top -= expandHeight; + cropRect.bottom += expandHeight; + } + final int outWidth = (int) Math.round(cropRect.width() * cropScale); + final int outHeight = (int) Math.round(cropRect.height() * cropScale); + + Runnable onEndCrop = new Runnable() { + public void run() { + updateWallpaperDimensions(outWidth, outHeight); + if (finishActivityWhenDone) { + setResult(Activity.RESULT_OK); + finish(); + } + } + }; + BitmapCropTask cropTask = new BitmapCropTask(this, uri, + cropRect, cropRotation, outWidth, outHeight, true, false, onEndCrop); + if (onBitmapCroppedHandler != null) { + cropTask.setOnBitmapCropped(onBitmapCroppedHandler); + } + cropTask.execute(); + } + + @Override + protected void setWallpaper(String filePath, final boolean finishActivityWhenDone) { + int rotation = getRotationFromExif(filePath); + BitmapCropTask cropTask = new BitmapCropTask( + this, filePath, null, rotation, 0, 0, true, false, null); + final Point bounds = cropTask.getImageBounds(); + Runnable onEndCrop = new Runnable() { + public void run() { + updateWallpaperDimensions(bounds.x, bounds.y); + if (finishActivityWhenDone) { + setResult(Activity.RESULT_OK); + finish(); + } + } + }; + cropTask.setOnEndRunnable(onEndCrop); + cropTask.setNoCrop(true); + cropTask.execute(); + } + + protected static class BitmapCropTask extends AsyncTask { + Uri mInUri = null; + Context mContext; + String mInFilePath; + byte[] mInImageBytes; + int mInResId = 0; + InputStream mInStream; + RectF mCropBounds = null; + int mOutWidth, mOutHeight; + int mRotation; + String mOutputFormat = "jpg"; // for now + boolean mSetWallpaper; + boolean mSaveCroppedBitmap; + Bitmap mCroppedBitmap; + Runnable mOnEndRunnable; + Resources mResources; + OnBitmapCroppedHandler mOnBitmapCroppedHandler; + boolean mNoCrop; + boolean mImageFromAsset; + + public BitmapCropTask(Context c, Resources res , String assetPath, + RectF cropBounds, int rotation, int outWidth, int outHeight, + boolean setWallpaper, boolean saveCroppedBitmap, Runnable onEndRunnable) { + mContext = c; + mResources = res; + mInFilePath = assetPath; + mImageFromAsset = true; + init(cropBounds, rotation, + outWidth, outHeight, setWallpaper, saveCroppedBitmap, onEndRunnable); + } + + public BitmapCropTask(Context c, String filePath, + RectF cropBounds, int rotation, int outWidth, int outHeight, + boolean setWallpaper, boolean saveCroppedBitmap, Runnable onEndRunnable) { + mContext = c; + mInFilePath = filePath; + init(cropBounds, rotation, + outWidth, outHeight, setWallpaper, saveCroppedBitmap, onEndRunnable); + } + + public BitmapCropTask(byte[] imageBytes, + RectF cropBounds, int rotation, int outWidth, int outHeight, + boolean setWallpaper, boolean saveCroppedBitmap, Runnable onEndRunnable) { + mInImageBytes = imageBytes; + init(cropBounds, rotation, + outWidth, outHeight, setWallpaper, saveCroppedBitmap, onEndRunnable); + } + + public BitmapCropTask(Context c, Uri inUri, + RectF cropBounds, int rotation, int outWidth, int outHeight, + boolean setWallpaper, boolean saveCroppedBitmap, Runnable onEndRunnable) { + mContext = c; + mInUri = inUri; + init(cropBounds, rotation, + outWidth, outHeight, setWallpaper, saveCroppedBitmap, onEndRunnable); + } + + public BitmapCropTask(Context c, Resources res, int inResId, + RectF cropBounds, int rotation, int outWidth, int outHeight, + boolean setWallpaper, boolean saveCroppedBitmap, Runnable onEndRunnable) { + mContext = c; + mInResId = inResId; + mResources = res; + init(cropBounds, rotation, + outWidth, outHeight, setWallpaper, saveCroppedBitmap, onEndRunnable); + } + + private void init(RectF cropBounds, int rotation, int outWidth, int outHeight, + boolean setWallpaper, boolean saveCroppedBitmap, Runnable onEndRunnable) { + mCropBounds = cropBounds; + mRotation = rotation; + mOutWidth = outWidth; + mOutHeight = outHeight; + mSetWallpaper = setWallpaper; + mSaveCroppedBitmap = saveCroppedBitmap; + mOnEndRunnable = onEndRunnable; + } + + public void setOnBitmapCropped(OnBitmapCroppedHandler handler) { + mOnBitmapCroppedHandler = handler; + } + + public void setNoCrop(boolean value) { + mNoCrop = value; + } + + public void setOnEndRunnable(Runnable onEndRunnable) { + mOnEndRunnable = onEndRunnable; + } + + // Helper to setup input stream + private void regenerateInputStream() { + if (mInUri == null && mInResId == 0 && mInFilePath == null && mInImageBytes == null && !mImageFromAsset) { + Log.w(TAG, "cannot read original file, no input URI, resource ID, or " + + "image byte array given"); + } else { + Utils.closeSilently(mInStream); + try { + if (mImageFromAsset) { + AssetManager am = mResources.getAssets(); + String[] pathImages = am.list(mInFilePath); + if (pathImages == null || pathImages.length == 0) { + throw new IOException("did not find any images in path: " + mInFilePath); + } + InputStream is = am.open(mInFilePath + File.separator + pathImages[0]); + mInStream = new BufferedInputStream(is); + } else if (mInUri != null) { + mInStream = new BufferedInputStream( + mContext.getContentResolver().openInputStream(mInUri)); + } else if (mInFilePath != null) { + mInStream = mContext.openFileInput(mInFilePath); + } else if (mInImageBytes != null) { + mInStream = new BufferedInputStream( + new ByteArrayInputStream(mInImageBytes)); + } else { + mInStream = new BufferedInputStream( + mResources.openRawResource(mInResId)); + } + } catch (FileNotFoundException e) { + Log.w(TAG, "cannot read file: " + mInUri.toString(), e); + } catch (IOException e) { + Log.w(TAG, "cannot read file: " + mInUri.toString(), e); + } + } + } + + public Point getImageBounds() { + regenerateInputStream(); + if (mInStream != null) { + BitmapFactory.Options options = new BitmapFactory.Options(); + options.inJustDecodeBounds = true; + BitmapFactory.decodeStream(mInStream, null, options); + if (options.outWidth != 0 && options.outHeight != 0) { + return new Point(options.outWidth, options.outHeight); + } + } + return null; + } + + public void setCropBounds(RectF cropBounds) { + mCropBounds = cropBounds; + } + + public Bitmap getCroppedBitmap() { + return mCroppedBitmap; + } + public boolean cropBitmap() { + boolean failure = false; + + regenerateInputStream(); + + WallpaperManager wallpaperManager = null; + if (mSetWallpaper) { + wallpaperManager = WallpaperManager.getInstance(mContext.getApplicationContext()); + } + if (mSetWallpaper && mNoCrop && mInStream != null) { + try { + wallpaperManager.setKeyguardStream(mInStream); + } catch (IOException e) { + Log.w(TAG, "cannot write stream to wallpaper", e); + failure = true; + } + return !failure; + } + if (mInStream != null) { + // Find crop bounds (scaled to original image size) + Rect roundedTrueCrop = new Rect(); + Matrix rotateMatrix = new Matrix(); + Matrix inverseRotateMatrix = new Matrix(); + if (mRotation > 0) { + rotateMatrix.setRotate(mRotation); + inverseRotateMatrix.setRotate(-mRotation); + + mCropBounds.roundOut(roundedTrueCrop); + mCropBounds = new RectF(roundedTrueCrop); + + Point bounds = getImageBounds(); + + float[] rotatedBounds = new float[] { bounds.x, bounds.y }; + rotateMatrix.mapPoints(rotatedBounds); + rotatedBounds[0] = Math.abs(rotatedBounds[0]); + rotatedBounds[1] = Math.abs(rotatedBounds[1]); + + mCropBounds.offset(-rotatedBounds[0]/2, -rotatedBounds[1]/2); + inverseRotateMatrix.mapRect(mCropBounds); + mCropBounds.offset(bounds.x/2, bounds.y/2); + + regenerateInputStream(); + } + + mCropBounds.roundOut(roundedTrueCrop); + + if (roundedTrueCrop.width() <= 0 || roundedTrueCrop.height() <= 0) { + Log.w(TAG, "crop has bad values for full size image"); + failure = true; + return false; + } + + // See how much we're reducing the size of the image + int scaleDownSampleSize = Math.min(roundedTrueCrop.width() / mOutWidth, + roundedTrueCrop.height() / mOutHeight); + + // Attempt to open a region decoder + BitmapRegionDecoder decoder = null; + try { + decoder = BitmapRegionDecoder.newInstance(mInStream, true); + } catch (IOException e) { + Log.w(TAG, "cannot open region decoder for file: " + mInUri.toString(), e); + } + + Bitmap crop = null; + if (decoder != null) { + // Do region decoding to get crop bitmap + BitmapFactory.Options options = new BitmapFactory.Options(); + if (scaleDownSampleSize > 1) { + options.inSampleSize = scaleDownSampleSize; + } + crop = decoder.decodeRegion(roundedTrueCrop, options); + decoder.recycle(); + } + + if (crop == null) { + // BitmapRegionDecoder has failed, try to crop in-memory + regenerateInputStream(); + Bitmap fullSize = null; + if (mInStream != null) { + BitmapFactory.Options options = new BitmapFactory.Options(); + if (scaleDownSampleSize > 1) { + options.inSampleSize = scaleDownSampleSize; + } + fullSize = BitmapFactory.decodeStream(mInStream, null, options); + } + if (fullSize != null) { + mCropBounds.left /= scaleDownSampleSize; + mCropBounds.top /= scaleDownSampleSize; + mCropBounds.bottom /= scaleDownSampleSize; + mCropBounds.right /= scaleDownSampleSize; + mCropBounds.roundOut(roundedTrueCrop); + + crop = Bitmap.createBitmap(fullSize, roundedTrueCrop.left, + roundedTrueCrop.top, roundedTrueCrop.width(), + roundedTrueCrop.height()); + } + } + + if (crop == null) { + Log.w(TAG, "cannot decode file: " + mInUri.toString()); + failure = true; + return false; + } + if (mOutWidth > 0 && mOutHeight > 0 || mRotation > 0) { + float[] dimsAfter = new float[] { crop.getWidth(), crop.getHeight() }; + rotateMatrix.mapPoints(dimsAfter); + dimsAfter[0] = Math.abs(dimsAfter[0]); + dimsAfter[1] = Math.abs(dimsAfter[1]); + + if (!(mOutWidth > 0 && mOutHeight > 0)) { + mOutWidth = Math.round(dimsAfter[0]); + mOutHeight = Math.round(dimsAfter[1]); + } + + RectF cropRect = new RectF(0, 0, dimsAfter[0], dimsAfter[1]); + RectF returnRect = new RectF(0, 0, mOutWidth, mOutHeight); + + Matrix m = new Matrix(); + if (mRotation == 0) { + m.setRectToRect(cropRect, returnRect, Matrix.ScaleToFit.FILL); + } else { + Matrix m1 = new Matrix(); + m1.setTranslate(-crop.getWidth() / 2f, -crop.getHeight() / 2f); + Matrix m2 = new Matrix(); + m2.setRotate(mRotation); + Matrix m3 = new Matrix(); + m3.setTranslate(dimsAfter[0] / 2f, dimsAfter[1] / 2f); + Matrix m4 = new Matrix(); + m4.setRectToRect(cropRect, returnRect, Matrix.ScaleToFit.FILL); + + Matrix c1 = new Matrix(); + c1.setConcat(m2, m1); + Matrix c2 = new Matrix(); + c2.setConcat(m4, m3); + m.setConcat(c2, c1); + } + + Bitmap tmp = Bitmap.createBitmap((int) returnRect.width(), + (int) returnRect.height(), Bitmap.Config.ARGB_8888); + if (tmp != null) { + Canvas c = new Canvas(tmp); + Paint p = new Paint(); + p.setFilterBitmap(true); + c.drawBitmap(crop, m, p); + crop = tmp; + } + } + + if (mSaveCroppedBitmap) { + mCroppedBitmap = crop; + } + + // Get output compression format + CompressFormat cf = + convertExtensionToCompressFormat(getFileExtension(mOutputFormat)); + + // Compress to byte array + ByteArrayOutputStream tmpOut = new ByteArrayOutputStream(2048); + if (crop.compress(cf, DEFAULT_COMPRESS_QUALITY, tmpOut)) { + // If we need to set to the wallpaper, set it + if (mSetWallpaper && wallpaperManager != null) { + try { + byte[] outByteArray = tmpOut.toByteArray(); + wallpaperManager.setKeyguardStream(new ByteArrayInputStream(outByteArray)); + if (mOnBitmapCroppedHandler != null) { + mOnBitmapCroppedHandler.onBitmapCropped(outByteArray); + } + } catch (IOException e) { + Log.w(TAG, "cannot write stream to wallpaper", e); + failure = true; + } + } + } else { + Log.w(TAG, "cannot compress bitmap"); + failure = true; + } + } else { + Log.w(TAG, "could not complete crop task because input stream is null"); + } + return !failure; // True if any of the operations failed + } + + @Override + protected Boolean doInBackground(Void... params) { + return cropBitmap(); + } + + @Override + protected void onPostExecute(Boolean result) { + if (mOnEndRunnable != null) { + mOnEndRunnable.run(); + } + } + } + + @Override + protected void setWallpaperStripYOffset(int offset) { + mWallpaperStrip.setPadding(0, 0, 0, offset); + } + + // called by onCreate; this is subclassed to overwrite WallpaperCropActivity + protected void init() { + setContentView(R.layout.wallpaper_picker); + + mCropView = (CropView) findViewById(R.id.cropView); + mWallpaperStrip = findViewById(R.id.wallpaper_strip); + mCropView.setTouchCallback(new CropView.TouchCallback() { + LauncherViewPropertyAnimator mAnim; + @Override + public void onTouchDown() { + if (mAnim != null) { + mAnim.cancel(); + } + if (mWallpaperStrip.getAlpha() == 1f) { + mIgnoreNextTap = true; + } + mAnim = new LauncherViewPropertyAnimator(mWallpaperStrip); + mAnim.alpha(0f) + .setDuration(150) + .addListener(new Animator.AnimatorListener() { + public void onAnimationStart(Animator animator) { } + public void onAnimationEnd(Animator animator) { + mWallpaperStrip.setVisibility(View.INVISIBLE); + } + public void onAnimationCancel(Animator animator) { } + public void onAnimationRepeat(Animator animator) { } + }); + mAnim.setInterpolator(new AccelerateInterpolator(0.75f)); + mAnim.start(); + } + @Override + public void onTouchUp() { + mIgnoreNextTap = false; + } + @Override + public void onTap() { + boolean ignoreTap = mIgnoreNextTap; + mIgnoreNextTap = false; + if (!ignoreTap) { + if (mAnim != null) { + mAnim.cancel(); + } + mWallpaperStrip.setVisibility(View.VISIBLE); + mAnim = new LauncherViewPropertyAnimator(mWallpaperStrip); + mAnim.alpha(1f) + .setDuration(150) + .setInterpolator(new DecelerateInterpolator(0.75f)); + mAnim.start(); + } + } + }); + + mThumbnailOnClickListener = new OnClickListener() { + public void onClick(View v) { + if (mActionMode != null) { + // When CAB is up, clicking toggles the item instead + if (v.isLongClickable()) { + mLongClickListener.onLongClick(v); + } + return; + } + WallpaperTileInfo info = (WallpaperTileInfo) v.getTag(); + if (info.isSelectable()) { + if (mSelectedThumb != null) { + mSelectedThumb.setSelected(false); + mSelectedThumb = null; + } + mSelectedThumb = v; + v.setSelected(true); + // TODO: Remove this once the accessibility framework and + // services have better support for selection state. + v.announceForAccessibility( + getString(R.string.announce_selection, v.getContentDescription())); + } + info.onClick(LockWallpaperPickerActivity.this); + } + }; + mLongClickListener = new View.OnLongClickListener() { + // Called when the user long-clicks on someView + public boolean onLongClick(View view) { + CheckableFrameLayout c = (CheckableFrameLayout) view; + c.toggle(); + + if (mActionMode != null) { + mActionMode.invalidate(); + } else { + // Start the CAB using the ActionMode.Callback defined below + mActionMode = startActionMode(mActionModeCallback); + int childCount = mWallpapersView.getChildCount(); + for (int i = 0; i < childCount; i++) { + mWallpapersView.getChildAt(i).setSelected(false); + } + } + return true; + } + }; + + mWallpapersView = (LinearLayout) findViewById(R.id.wallpaper_list); + + // Add a tile for the Gallery + LinearLayout masterWallpaperList = (LinearLayout) findViewById(R.id.master_wallpaper_list); + FrameLayout pickImageTile = (FrameLayout) getLayoutInflater(). + inflate(R.layout.wallpaper_picker_image_picker_item, masterWallpaperList, false); + setWallpaperItemPaddingToZero(pickImageTile); + masterWallpaperList.addView(pickImageTile, 0); + + // Add tile for clear image + FrameLayout clearImageTile = (FrameLayout) getLayoutInflater(). + inflate(R.layout.wallpaper_picker_clear, masterWallpaperList, false); + setWallpaperItemPaddingToZero(clearImageTile); + masterWallpaperList.addView(clearImageTile, 0); + + // theme LOCKSCREEN wallpapers + ArrayList themeLockWallpapers = findThemeLockWallpapers(); + ThemeLockWallpapersAdapter tla = new ThemeLockWallpapersAdapter(this, themeLockWallpapers); + populateWallpapersFromAdapter(mWallpapersView, tla, false, true); + + // theme wallpapers + ArrayList themeWallpapers = findThemeWallpapers(); + ThemeWallpapersAdapter ta = new ThemeWallpapersAdapter(this, themeWallpapers); + populateWallpapersFromAdapter(mWallpapersView, ta, false, true); + + // Populate the saved wallpapers + mSavedImages = new SavedWallpaperImages(this); + mSavedImages.loadThumbnailsAndImageIdList(); + populateWallpapersFromAdapter(mWallpapersView, mSavedImages, true, true); + + // Make its background the last photo taken on external storage + Bitmap lastPhoto = getThumbnailOfLastPhoto(); + if (lastPhoto != null) { + ImageView galleryThumbnailBg = + (ImageView) pickImageTile.findViewById(R.id.wallpaper_image); + galleryThumbnailBg.setImageBitmap(getThumbnailOfLastPhoto()); + int colorOverlay = getResources().getColor(R.color.wallpaper_picker_translucent_gray); + galleryThumbnailBg.setColorFilter(colorOverlay, PorterDuff.Mode.SRC_ATOP); + } + + PickImageInfo pickImageInfo = new PickImageInfo(); + pickImageTile.setTag(pickImageInfo); + pickImageInfo.setView(pickImageTile); + pickImageTile.setOnClickListener(mThumbnailOnClickListener); + pickImageInfo.setView(pickImageTile); + + UserDesktopWallpaperInfo clearImageInfo = new UserDesktopWallpaperInfo(); + clearImageTile.setTag(clearImageInfo); + clearImageInfo.setView(clearImageTile); + clearImageTile.setOnClickListener(mThumbnailOnClickListener); + clearImageInfo.setView(clearImageTile); + + updateTileIndices(); + + // Update the scroll for RTL + initializeScrollForRtl(); + + // Create smooth layout transitions for when items are deleted + final LayoutTransition transitioner = new LayoutTransition(); + transitioner.setDuration(200); + transitioner.setStartDelay(LayoutTransition.CHANGE_DISAPPEARING, 0); + transitioner.setAnimator(LayoutTransition.DISAPPEARING, null); + mWallpapersView.setLayoutTransition(transitioner); + + // Action bar + // Show the custom action bar view + final ActionBar actionBar = getActionBar(); + actionBar.setCustomView(R.layout.actionbar_set_wallpaper); + actionBar.getCustomView().setOnClickListener( + new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mSelectedThumb != null) { + WallpaperTileInfo info = (WallpaperTileInfo) mSelectedThumb.getTag(); + info.onSave(LockWallpaperPickerActivity.this); + } + } + }); + + // CAB for deleting items + mActionModeCallback = new ActionMode.Callback() { + // Called when the action mode is created; startActionMode() was called + @Override + public boolean onCreateActionMode(ActionMode mode, Menu menu) { + // Inflate a menu resource providing context menu items + MenuInflater inflater = mode.getMenuInflater(); + inflater.inflate(R.menu.cab_delete_wallpapers, menu); + return true; + } + + private int numCheckedItems() { + int childCount = mWallpapersView.getChildCount(); + int numCheckedItems = 0; + for (int i = 0; i < childCount; i++) { + CheckableFrameLayout c = (CheckableFrameLayout) mWallpapersView.getChildAt(i); + if (c.isChecked()) { + numCheckedItems++; + } + } + return numCheckedItems; + } + + // Called each time the action mode is shown. Always called after onCreateActionMode, + // but may be called multiple times if the mode is invalidated. + @Override + public boolean onPrepareActionMode(ActionMode mode, Menu menu) { + int numCheckedItems = numCheckedItems(); + if (numCheckedItems == 0) { + mode.finish(); + return true; + } else { + mode.setTitle(getResources().getQuantityString( + R.plurals.number_of_items_selected, numCheckedItems, numCheckedItems)); + return true; + } + } + + // Called when the user selects a contextual menu item + @Override + public boolean onActionItemClicked(ActionMode mode, MenuItem item) { + int itemId = item.getItemId(); + if (itemId == R.id.menu_delete) { + int childCount = mWallpapersView.getChildCount(); + ArrayList viewsToRemove = new ArrayList(); + for (int i = 0; i < childCount; i++) { + CheckableFrameLayout c = + (CheckableFrameLayout) mWallpapersView.getChildAt(i); + if (c.isChecked()) { + WallpaperTileInfo info = (WallpaperTileInfo) c.getTag(); + info.onDelete(LockWallpaperPickerActivity.this); + viewsToRemove.add(c); + } + } + for (View v : viewsToRemove) { + mWallpapersView.removeView(v); + } + updateTileIndices(); + mode.finish(); // Action picked, so close the CAB + return true; + } else { + return false; + } + } + + // Called when the user exits the action mode + @Override + public void onDestroyActionMode(ActionMode mode) { + int childCount = mWallpapersView.getChildCount(); + for (int i = 0; i < childCount; i++) { + CheckableFrameLayout c = (CheckableFrameLayout) mWallpapersView.getChildAt(i); + c.setChecked(false); + } + mSelectedThumb.setSelected(true); + mActionMode = null; + } + }; + } + + private void initializeScrollForRtl() { + final HorizontalScrollView scroll = + (HorizontalScrollView) findViewById(R.id.wallpaper_scroll_container); + + if (scroll.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) { + final ViewTreeObserver observer = scroll.getViewTreeObserver(); + observer.addOnGlobalLayoutListener(new OnGlobalLayoutListener() { + public void onGlobalLayout() { + LinearLayout masterWallpaperList = + (LinearLayout) findViewById(R.id.master_wallpaper_list); + scroll.scrollTo(masterWallpaperList.getWidth(), 0); + scroll.getViewTreeObserver().removeOnGlobalLayoutListener(this); + } + }); + } + } + + public boolean enableRotation() { + return super.enableRotation() || Launcher.sForceEnableRotation; + } + + protected Bitmap getThumbnailOfLastPhoto() { + Cursor cursor = MediaStore.Images.Media.query(getContentResolver(), + MediaStore.Images.Media.EXTERNAL_CONTENT_URI, + new String[] { MediaStore.Images.ImageColumns._ID, + MediaStore.Images.ImageColumns.DATE_TAKEN}, + null, null, MediaStore.Images.ImageColumns.DATE_TAKEN + " DESC LIMIT 1"); + Bitmap thumb = null; + if (cursor != null) { + if (cursor.moveToFirst()) { + int id = cursor.getInt(0); + thumb = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(), + id, MediaStore.Images.Thumbnails.MINI_KIND, null); + } + cursor.close(); + } + return thumb; + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + return super.onPrepareOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle presses on the action bar items + switch (item.getItemId()) { + default: + return super.onOptionsItemSelected(item); + } + } + + protected void onStop() { + super.onStop(); + mWallpaperStrip = findViewById(R.id.wallpaper_strip); + if (mWallpaperStrip.getAlpha() < 1f) { + mWallpaperStrip.setAlpha(1f); + mWallpaperStrip.setVisibility(View.VISIBLE); + } + } + + @Override + protected void onDestroy() { + mWallpapersView.removeAllViews(); + super.onDestroy(); + } + + protected void onSaveInstanceState(Bundle outState) { + outState.putParcelableArrayList(TEMP_WALLPAPER_TILES, mTempWallpaperTiles); + } + + protected void onRestoreInstanceState(Bundle savedInstanceState) { + ArrayList uris = savedInstanceState.getParcelableArrayList(TEMP_WALLPAPER_TILES); + for (Uri uri : uris) { + addTemporaryWallpaperTile(uri); + } + } + + private void populateWallpapersFromAdapter(ViewGroup parent, BaseAdapter adapter, + boolean addLongPressHandler, boolean selectFirstTile) { + for (int i = 0; i < adapter.getCount(); i++) { + FrameLayout thumbnail = (FrameLayout) adapter.getView(i, null, parent); + parent.addView(thumbnail, i); + WallpaperTileInfo info = (WallpaperTileInfo) adapter.getItem(i); + thumbnail.setTag(info); + info.setView(thumbnail); + if (addLongPressHandler) { + addLongPressHandler(thumbnail); + } + thumbnail.setOnClickListener(mThumbnailOnClickListener); + if (i == 0 && selectFirstTile) { + mThumbnailOnClickListener.onClick(thumbnail); + } + } + } + + private void updateTileIndices() { + LinearLayout masterWallpaperList = (LinearLayout) findViewById(R.id.master_wallpaper_list); + final int childCount = masterWallpaperList.getChildCount(); + final Resources res = getResources(); + + // Do two passes; the first pass gets the total number of tiles + int numTiles = 0; + for (int passNum = 0; passNum < 2; passNum++) { + int tileIndex = 0; + for (int i = 0; i < childCount; i++) { + View child = masterWallpaperList.getChildAt(i); + LinearLayout subList; + + int subListStart; + int subListEnd; + if (child.getTag() instanceof WallpaperTileInfo) { + subList = masterWallpaperList; + subListStart = i; + subListEnd = i + 1; + } else { // if (child instanceof LinearLayout) { + subList = (LinearLayout) child; + subListStart = 0; + subListEnd = subList.getChildCount(); + } + + for (int j = subListStart; j < subListEnd; j++) { + WallpaperTileInfo info = (WallpaperTileInfo) subList.getChildAt(j).getTag(); + if (info.isNamelessWallpaper()) { + if (passNum == 0) { + numTiles++; + } else { + CharSequence label = res.getString( + R.string.wallpaper_accessibility_name, ++tileIndex, numTiles); + info.onIndexUpdated(label); + } + } + } + } + } + } + + private static Point getDefaultThumbnailSize(Resources res) { + return new Point(res.getDimensionPixelSize(R.dimen.wallpaperThumbnailWidth), + res.getDimensionPixelSize(R.dimen.wallpaperThumbnailHeight)); + } + + private static Bitmap createThumbnail(Point size, Context context, Uri uri, byte[] imageBytes, + Resources res, int resId, int rotation, boolean leftAligned) { + int width = size.x; + int height = size.y; + + BitmapCropTask cropTask; + if (uri != null) { + cropTask = new BitmapCropTask( + context, uri, null, rotation, width, height, false, true, null); + } else if (imageBytes != null) { + cropTask = new BitmapCropTask( + imageBytes, null, rotation, width, height, false, true, null); + } else { + cropTask = new BitmapCropTask( + context, res, resId, null, rotation, width, height, false, true, null); + } + Point bounds = cropTask.getImageBounds(); + if (bounds == null || bounds.x == 0 || bounds.y == 0) { + return null; + } + + Matrix rotateMatrix = new Matrix(); + rotateMatrix.setRotate(rotation); + float[] rotatedBounds = new float[] { bounds.x, bounds.y }; + rotateMatrix.mapPoints(rotatedBounds); + rotatedBounds[0] = Math.abs(rotatedBounds[0]); + rotatedBounds[1] = Math.abs(rotatedBounds[1]); + + RectF cropRect = WallpaperCropActivity.getMaxCropRect( + (int) rotatedBounds[0], (int) rotatedBounds[1], width, height, leftAligned); + cropTask.setCropBounds(cropRect); + + if (cropTask.cropBitmap()) { + return cropTask.getCroppedBitmap(); + } else { + return null; + } + } + + private void addTemporaryWallpaperTile(Uri uri) { + mTempWallpaperTiles.add(uri); + // Add a tile for the image picked from Gallery + FrameLayout pickedImageThumbnail = (FrameLayout) getLayoutInflater(). + inflate(R.layout.wallpaper_picker_item, mWallpapersView, false); + setWallpaperItemPaddingToZero(pickedImageThumbnail); + + // Load the thumbnail + ImageView image = (ImageView) pickedImageThumbnail.findViewById(R.id.wallpaper_image); + Point defaultSize = getDefaultThumbnailSize(this.getResources()); + int rotation = WallpaperCropActivity.getRotationFromExif(this, uri); + Bitmap thumb = createThumbnail(defaultSize, this, uri, null, null, 0, rotation, false); + if (thumb != null) { + image.setImageBitmap(thumb); + Drawable thumbDrawable = image.getDrawable(); + thumbDrawable.setDither(true); + } else { + Log.e(TAG, "Error loading thumbnail for uri=" + uri); + } + mWallpapersView.addView(pickedImageThumbnail, 0); + + UriWallpaperInfo info = new UriWallpaperInfo(uri); + pickedImageThumbnail.setTag(info); + info.setView(pickedImageThumbnail); + addLongPressHandler(pickedImageThumbnail); + updateTileIndices(); + pickedImageThumbnail.setOnClickListener(mThumbnailOnClickListener); + mThumbnailOnClickListener.onClick(pickedImageThumbnail); + } + + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == IMAGE_PICK && resultCode == RESULT_OK) { + if (data != null && data.getData() != null) { + Uri uri = data.getData(); + addTemporaryWallpaperTile(uri); + } + } else if (requestCode == PICK_WALLPAPER_THIRD_PARTY_ACTIVITY) { + setResult(RESULT_OK); + finish(); + } + } + + static void setWallpaperItemPaddingToZero(FrameLayout frameLayout) { + frameLayout.setPadding(0, 0, 0, 0); + frameLayout.setForeground(new ZeroPaddingDrawable(frameLayout.getForeground())); + } + + private void addLongPressHandler(View v) { + v.setOnLongClickListener(mLongClickListener); + } + + private ArrayList findThemeWallpapers() { + ArrayList themeWallpapers = + new ArrayList(); + ContentResolver cr = getContentResolver(); + String[] projection = { ThemesColumns.PKG_NAME, ThemesColumns.IS_LEGACY_THEME }; + String selection = ThemesColumns.MODIFIES_LAUNCHER + "=? AND " + + ThemesColumns.PKG_NAME + "!=?"; + String[] selectoinArgs = {"1", "default"}; + String sortOrder = null; + Cursor c = cr.query(ThemesColumns.CONTENT_URI, projection, selection, + selectoinArgs, sortOrder); + if (c != null) { + Bitmap bmp; + while (c.moveToNext()) { + String pkgName = c.getString(c.getColumnIndexOrThrow(ThemesColumns.PKG_NAME)); + boolean isLegacy = c.getInt(c.getColumnIndexOrThrow( + ThemesColumns.IS_LEGACY_THEME)) == 1; + bmp = getThemeWallpaper(this, "wallpapers", pkgName, isLegacy, true /* thumb*/); + themeWallpapers.add( + new ThemeWallpaperInfo(this, pkgName, isLegacy, + new BitmapDrawable(getResources(), bmp))); + if (bmp != null) { + Log.d("", String.format("Loaded bitmap of size %dx%d for %s", + bmp.getWidth(), bmp.getHeight(), pkgName)); + } + } + c.close(); + } + return themeWallpapers; + } + + private ArrayList findThemeLockWallpapers() { + ArrayList themeWallpapers = + new ArrayList(); + ContentResolver cr = getContentResolver(); + String[] projection = { ThemesColumns.PKG_NAME }; + String selection = ThemesColumns.MODIFIES_LOCKSCREEN + "=? AND " + + ThemesColumns.PKG_NAME + "!=?"; + String[] selectoinArgs = {"1", "default"}; + String sortOrder = null; + Cursor c = cr.query(ThemesColumns.CONTENT_URI, projection, selection, + selectoinArgs, sortOrder); + if (c != null) { + Bitmap bmp; + while (c.moveToNext()) { + String pkgName = c.getString(c.getColumnIndexOrThrow(ThemesColumns.PKG_NAME)); + bmp = getThemeWallpaper(this, "lockscreen", pkgName, false, true /* thumb*/); + themeWallpapers.add( + new ThemeLockWallpaperInfo(this, pkgName, + new BitmapDrawable(getResources(), bmp))); + if (bmp != null) { + Log.d("", String.format("Loaded bitmap of size %dx%d for %s", + bmp.getWidth(), bmp.getHeight(), pkgName)); + } + } + c.close(); + } + return themeWallpapers; + } + + public Pair getWallpaperArrayResourceId() { + // Context.getPackageName() may return the "original" package name, + // com.android.launcher3; Resources needs the real package name, + // com.android.launcher3. So we ask Resources for what it thinks the + // package name should be. + final String packageName = getResources().getResourcePackageName(R.array.wallpapers); + try { + ApplicationInfo info = getPackageManager().getApplicationInfo(packageName, 0); + return new Pair(info, R.array.wallpapers); + } catch (PackageManager.NameNotFoundException e) { + return null; + } + } + + public CropView getCropView() { + return mCropView; + } + + public SavedWallpaperImages getSavedImages() { + return mSavedImages; + } + + static class ZeroPaddingDrawable extends LevelListDrawable { + public ZeroPaddingDrawable(Drawable d) { + super(); + addLevel(0, 0, d); + setLevel(0); + } + + @Override + public boolean getPadding(Rect padding) { + padding.set(0, 0, 0, 0); + return true; + } + } + + private static class ThemeLockWallpapersAdapter extends BaseAdapter implements ListAdapter { + private LayoutInflater mLayoutInflater; + private ArrayList mWallpapers; + + ThemeLockWallpapersAdapter(Activity activity, ArrayList wallpapers) { + mLayoutInflater = activity.getLayoutInflater(); + mWallpapers = wallpapers; + } + + public int getCount() { + return mWallpapers.size(); + } + + public ThemeLockWallpaperInfo getItem(int position) { + return mWallpapers.get(position); + } + + public long getItemId(int position) { + return position; + } + + public View getView(int position, View convertView, ViewGroup parent) { + Drawable thumb = mWallpapers.get(position).mThumb; + if (thumb == null) { + Log.e(TAG, "Error decoding thumbnail for wallpaper #" + position); + } + return createImageTileView(mLayoutInflater, position, convertView, parent, thumb); + } + } + + private static class ThemeWallpapersAdapter extends BaseAdapter implements ListAdapter { + private LayoutInflater mLayoutInflater; + private ArrayList mWallpapers; + + ThemeWallpapersAdapter(Activity activity, ArrayList wallpapers) { + mLayoutInflater = activity.getLayoutInflater(); + mWallpapers = wallpapers; + } + + public int getCount() { + return mWallpapers.size(); + } + + public ThemeWallpaperInfo getItem(int position) { + return mWallpapers.get(position); + } + + public long getItemId(int position) { + return position; + } + + public View getView(int position, View convertView, ViewGroup parent) { + Drawable thumb = mWallpapers.get(position).mThumb; + if (thumb == null) { + Log.e(TAG, "Error decoding thumbnail for wallpaper #" + position); + } + return createImageTileView(mLayoutInflater, position, convertView, parent, thumb); + } + } + + public static View createImageTileView(LayoutInflater layoutInflater, int position, + View convertView, ViewGroup parent, Drawable thumb) { + View view; + + if (convertView == null) { + view = layoutInflater.inflate(R.layout.wallpaper_picker_item, parent, false); + } else { + view = convertView; + } + + setWallpaperItemPaddingToZero((FrameLayout) view); + + ImageView image = (ImageView) view.findViewById(R.id.wallpaper_image); + + if (thumb != null) { + image.setImageDrawable(thumb); + thumb.setDither(true); + } + + return view; + } + + private static Bitmap getThemeWallpaper(Context context, String path, String pkgName, + boolean legacyTheme, boolean thumb) { + if (legacyTheme) { + return getLegacyThemeWallpaper(context, pkgName, thumb); + } + InputStream is = null; + try { + Resources res = context.getPackageManager().getResourcesForApplication(pkgName); + if (res == null) { + return null; + } + + AssetManager am = res.getAssets(); + String[] wallpapers = am.list(path); + if (wallpapers == null || wallpapers.length == 0) { + return null; + } + is = am.open(path + File.separator + wallpapers[0]); + + BitmapFactory.Options bounds = new BitmapFactory.Options(); + bounds.inJustDecodeBounds = true; + BitmapFactory.decodeStream(is, null, bounds); + if ((bounds.outWidth == -1) || (bounds.outHeight == -1)) + return null; + + int originalSize = (bounds.outHeight > bounds.outWidth) ? bounds.outHeight + : bounds.outWidth; + Point outSize; + + if (thumb) { + outSize = getDefaultThumbnailSize(context.getResources()); + } else { + outSize = getDefaultWallpaperSize(res, ((Activity) context).getWindowManager()); + } + int thumbSampleSize = (outSize.y > outSize.x) ? outSize.y : outSize.x; + + BitmapFactory.Options opts = new BitmapFactory.Options(); + opts.inSampleSize = originalSize / thumbSampleSize; + return BitmapFactory.decodeStream(is, null, opts); + } catch (IOException e) { + return null; + } catch (NameNotFoundException e) { + return null; + } catch (OutOfMemoryError e) { + return null; + } finally { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + } + } + } + } + + private static Bitmap getLegacyThemeWallpaper(Context context, String pkgName, boolean thumb) { + try { + final PackageManager pm = context.getPackageManager(); + PackageInfo pi = pm.getPackageInfo(pkgName, 0); + Resources res = context.getPackageManager().getResourcesForApplication(pkgName); + + if (pi == null || res == null) { + return null; + } + int resId = pi.legacyThemeInfos[0].wallpaperResourceId; + + BitmapFactory.Options opts = new BitmapFactory.Options(); + opts.inJustDecodeBounds = true; + BitmapFactory.decodeResource(res, resId, opts); + if ((opts.outWidth == -1) || (opts.outHeight == -1)) + return null; + + int originalSize = (opts.outHeight > opts.outWidth) ? opts.outHeight + : opts.outWidth; + Point outSize; + if (thumb) { + outSize = getDefaultThumbnailSize(context.getResources()); + } else { + outSize = getDefaultWallpaperSize(res, ((Activity) context).getWindowManager()); + } + int thumbSampleSize = (outSize.y > outSize.x) ? outSize.y : outSize.x; + + opts.inJustDecodeBounds = false; + opts.inSampleSize = originalSize / thumbSampleSize; + + return BitmapFactory.decodeResource(res, resId, opts); + } catch (NameNotFoundException e) { + return null; + } catch (OutOfMemoryError e1) { + return null; + } + } +} diff --git a/src/com/android/launcher3/SavedWallpaperImages.java b/src/com/android/launcher3/SavedWallpaperImages.java index 8d5b00535..a418b8f5c 100644 --- a/src/com/android/launcher3/SavedWallpaperImages.java +++ b/src/com/android/launcher3/SavedWallpaperImages.java @@ -49,7 +49,7 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter { Context mContext; LayoutInflater mLayoutInflater; - public static class SavedWallpaperTile extends WallpaperPickerActivity.WallpaperTileInfo { + public static class SavedWallpaperTile extends WallpaperCropActivity.WallpaperTileInfo { private int mDbId; private Drawable mThumb; public SavedWallpaperTile(int dbId, Drawable thumb) { @@ -57,7 +57,7 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter { mThumb = thumb; } @Override - public void onClick(WallpaperPickerActivity a) { + public void onClick(WallpaperCropActivity a) { String imageFilename = a.getSavedImages().getImageFilename(mDbId); File file = new File(a.getFilesDir(), imageFilename); CropView v = a.getCropView(); @@ -68,13 +68,13 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter { v.setTouchEnabled(false); } @Override - public void onSave(WallpaperPickerActivity a) { + public void onSave(WallpaperCropActivity a) { boolean finishActivityWhenDone = true; String imageFilename = a.getSavedImages().getImageFilename(mDbId); a.setWallpaper(imageFilename, finishActivityWhenDone); } @Override - public void onDelete(WallpaperPickerActivity a) { + public void onDelete(WallpaperCropActivity a) { a.getSavedImages().deleteImage(mDbId); } @Override diff --git a/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java b/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java index 494694cbd..81cd5a0f0 100644 --- a/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java +++ b/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java @@ -51,7 +51,7 @@ public class ThirdPartyWallpaperPickerListAdapter extends BaseAdapter implements mResolveInfo = resolveInfo; } @Override - public void onClick(WallpaperPickerActivity a) { + public void onClick(WallpaperCropActivity a) { final ComponentName itemComponentName = new ComponentName( mResolveInfo.activityInfo.packageName, mResolveInfo.activityInfo.name); Intent launchIntent = new Intent(Intent.ACTION_SET_WALLPAPER); diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java index 30ec340b1..5796a5ddd 100644 --- a/src/com/android/launcher3/WallpaperCropActivity.java +++ b/src/com/android/launcher3/WallpaperCropActivity.java @@ -59,7 +59,7 @@ public class WallpaperCropActivity extends Activity { protected static final String WALLPAPER_WIDTH_KEY = "wallpaper.width"; protected static final String WALLPAPER_HEIGHT_KEY = "wallpaper.height"; - private static final int DEFAULT_COMPRESS_QUALITY = 90; + protected static final int DEFAULT_COMPRESS_QUALITY = 90; /** * The maximum bitmap size we allow to be returned through the intent. * Intents have a maximum of 1MB in total size. However, the Bitmap seems to @@ -68,11 +68,28 @@ public class WallpaperCropActivity extends Activity { * array instead of a Bitmap instance to avoid overhead. */ public static final int MAX_BMAP_IN_INTENT = 750000; - private static final float WALLPAPER_SCREENS_SPAN = 2f; + protected static final float WALLPAPER_SCREENS_SPAN = 2f; protected CropView mCropView; protected Uri mUri; + public static abstract class WallpaperTileInfo { + protected View mView; + public void setView(View v) { + mView = v; + } + public void onClick(WallpaperCropActivity a) {} + public void onSave(WallpaperCropActivity a) {} + public void onDelete(WallpaperCropActivity a) {} + public boolean isSelectable() { return false; } + public boolean isNamelessWallpaper() { return false; } + public void onIndexUpdated(CharSequence label) { + if (isNamelessWallpaper()) { + mView.setContentDescription(label); + } + } + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -123,7 +140,7 @@ public class WallpaperCropActivity extends Activity { // As a ratio of screen height, the total distance we want the parallax effect to span // horizontally - private static float wallpaperTravelToScreenWidthRatio(int width, int height) { + protected static float wallpaperTravelToScreenWidthRatio(int width, int height) { float aspectRatio = width / (float) height; // At an aspect ratio of 16/10, the wallpaper parallax effect should span 1.5 * screen width @@ -210,6 +227,8 @@ public class WallpaperCropActivity extends Activity { } } catch (IOException e) { Log.w(LOGTAG, "Getting exif data failed", e); + } catch (NullPointerException e) { + Log.w(LOGTAG, "Getting exif data failed", e); } return 0; } @@ -259,7 +278,7 @@ public class WallpaperCropActivity extends Activity { cropTask.execute(); } - private static boolean isScreenLarge(Resources res) { + protected static boolean isScreenLarge(Resources res) { Configuration config = res.getConfiguration(); return config.smallestScreenWidthDp >= 720; } @@ -752,4 +771,23 @@ public class WallpaperCropActivity extends Activity { ? "png" // We don't support gif compression. : "jpg"; } + + protected void setWallpaperStripYOffset(int bottom) { + // + } + + protected SavedWallpaperImages getSavedImages() { + // for subclasses + throw new UnsupportedOperationException("Not implemented for WallpaperCropActivity"); + } + + protected CropView getCropView() { + // for subclasses + throw new UnsupportedOperationException("Not implemented for WallpaperCropActivity"); + } + + protected void onLiveWallpaperPickerLaunch() { + // for subclasses + throw new UnsupportedOperationException("Not implemented for WallpaperCropActivity"); + } } diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java index d1c616028..3502043ea 100644 --- a/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/src/com/android/launcher3/WallpaperPickerActivity.java @@ -102,29 +102,12 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { private SavedWallpaperImages mSavedImages; private WallpaperInfo mLiveWallpaperInfoOnPickerLaunch; - public static abstract class WallpaperTileInfo { - protected View mView; - public void setView(View v) { - mView = v; - } - public void onClick(WallpaperPickerActivity a) {} - public void onSave(WallpaperPickerActivity a) {} - public void onDelete(WallpaperPickerActivity a) {} - public boolean isSelectable() { return false; } - public boolean isNamelessWallpaper() { return false; } - public void onIndexUpdated(CharSequence label) { - if (isNamelessWallpaper()) { - mView.setContentDescription(label); - } - } - } - public static class PickImageInfo extends WallpaperTileInfo { @Override - public void onClick(WallpaperPickerActivity a) { + public void onClick(WallpaperCropActivity a) { Intent intent = new Intent(Intent.ACTION_GET_CONTENT); intent.setType("image/*"); - Utilities.startActivityForResultSafely(a, intent, IMAGE_PICK); + Utilities.startActivityForResultSafely(((WallpaperPickerActivity)a), intent, IMAGE_PICK); } } @@ -134,14 +117,14 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { mUri = uri; } @Override - public void onClick(WallpaperPickerActivity a) { + public void onClick(WallpaperCropActivity a) { CropView v = a.getCropView(); int rotation = WallpaperCropActivity.getRotationFromExif(a, mUri); v.setTileSource(new BitmapRegionTileSource(a, mUri, 1024, rotation), null); v.setTouchEnabled(true); } @Override - public void onSave(final WallpaperPickerActivity a) { + public void onSave(final WallpaperCropActivity a) { boolean finishActivityWhenDone = true; OnBitmapCroppedHandler h = new OnBitmapCroppedHandler() { public void onBitmapCropped(byte[] imageBytes) { @@ -149,10 +132,10 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { // rotation is set to 0 since imageBytes has already been correctly rotated Bitmap thumb = createThumbnail( thumbSize, null, null, imageBytes, null, 0, 0, true); - a.getSavedImages().writeImage(thumb, imageBytes); + ((WallpaperPickerActivity)a).getSavedImages().writeImage(thumb, imageBytes); } }; - a.cropImageAndSetWallpaper(mUri, h, finishActivityWhenDone); + ((WallpaperPickerActivity)a).cropImageAndSetWallpaper(mUri, h, finishActivityWhenDone); } @Override public boolean isSelectable() { @@ -175,7 +158,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { mThumb = thumb; } @Override - public void onClick(WallpaperPickerActivity a) { + public void onClick(WallpaperCropActivity a) { int rotation = WallpaperCropActivity.getRotationFromExif(mResources, mResId); BitmapRegionTileSource source = new BitmapRegionTileSource( mResources, a, mResId, 1024, rotation); @@ -190,9 +173,9 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { v.setTouchEnabled(false); } @Override - public void onSave(WallpaperPickerActivity a) { + public void onSave(WallpaperCropActivity a) { boolean finishActivityWhenDone = true; - a.cropImageAndSetWallpaper(mResources, mResId, finishActivityWhenDone); + ((WallpaperPickerActivity)a).cropImageAndSetWallpaper(mResources, mResId, finishActivityWhenDone); } @Override public boolean isSelectable() { @@ -204,8 +187,9 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { } } - public void setWallpaperStripYOffset(float offset) { - mWallpaperStrip.setPadding(0, 0, 0, (int) offset); + @Override + protected void setWallpaperStripYOffset(int offset) { + mWallpaperStrip.setPadding(0, 0, 0, offset); } // called by onCreate; this is subclassed to overwrite WallpaperCropActivity diff --git a/src/com/android/launcher3/WallpaperRootView.java b/src/com/android/launcher3/WallpaperRootView.java index ceaa043a7..7b0d4f147 100644 --- a/src/com/android/launcher3/WallpaperRootView.java +++ b/src/com/android/launcher3/WallpaperRootView.java @@ -22,14 +22,14 @@ import android.util.AttributeSet; import android.widget.RelativeLayout; public class WallpaperRootView extends RelativeLayout { - private final WallpaperPickerActivity a; + private final WallpaperCropActivity a; public WallpaperRootView(Context context, AttributeSet attrs) { super(context, attrs); - a = (WallpaperPickerActivity) context; + a = (WallpaperCropActivity) context; } public WallpaperRootView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - a = (WallpaperPickerActivity) context; + a = (WallpaperCropActivity) context; } protected boolean fitSystemWindows(Rect insets) { diff --git a/src/com/android/photos/BitmapRegionTileSource.java b/src/com/android/photos/BitmapRegionTileSource.java index 5f6401868..4d1a84ed7 100644 --- a/src/com/android/photos/BitmapRegionTileSource.java +++ b/src/com/android/photos/BitmapRegionTileSource.java @@ -18,6 +18,7 @@ package com.android.photos; import android.annotation.TargetApi; import android.content.Context; +import android.content.res.AssetManager; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; @@ -36,6 +37,7 @@ import com.android.gallery3d.glrenderer.BitmapTexture; import com.android.photos.views.TiledImageRenderer; import java.io.BufferedInputStream; +import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -69,25 +71,38 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource { private Canvas mCanvas; public BitmapRegionTileSource(Context context, String path, int previewSize, int rotation) { - this(null, context, path, null, 0, previewSize, rotation); + this(null, context, path, null, 0, previewSize, rotation, false); + } + + public BitmapRegionTileSource(Resources res, Context context, String path, int previewSize, int rotation, boolean assetPath) { + this(res, context, path, null, 0, previewSize, rotation, assetPath); } public BitmapRegionTileSource(Context context, Uri uri, int previewSize, int rotation) { - this(null, context, null, uri, 0, previewSize, rotation); + this(null, context, null, uri, 0, previewSize, rotation, false); } public BitmapRegionTileSource(Resources res, Context context, int resId, int previewSize, int rotation) { - this(res, context, null, null, resId, previewSize, rotation); + this(res, context, null, null, resId, previewSize, rotation, false); } private BitmapRegionTileSource(Resources res, - Context context, String path, Uri uri, int resId, int previewSize, int rotation) { + Context context, String path, Uri uri, int resId, int previewSize, int rotation, boolean assetPath) { mTileSize = TiledImageRenderer.suggestedTileSize(context); mRotation = rotation; try { - if (path != null) { + if (path != null && !assetPath) { mDecoder = BitmapRegionDecoder.newInstance(path, true); + } else if (path != null && res != null && assetPath) { + AssetManager am = res.getAssets(); + String[] pathImages = am.list(path); + if (pathImages == null || pathImages.length == 0) { + throw new IOException("did not find any images in path: " + path); + } + InputStream is = am.open(path + File.separator + pathImages[0]); + BufferedInputStream bis = new BufferedInputStream(is); + mDecoder = BitmapRegionDecoder.newInstance(bis, true); } else if (uri != null) { InputStream is = context.getContentResolver().openInputStream(uri); BufferedInputStream bis = new BufferedInputStream(is); @@ -111,7 +126,7 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource { // Although this is the same size as the Bitmap that is likely already // loaded, the lifecycle is different and interactions are on a different // thread. Thus to simplify, this source will decode its own bitmap. - Bitmap preview = decodePreview(res, context, path, uri, resId, previewSize); + Bitmap preview = decodePreview(res, context, path, uri, resId, previewSize, assetPath); if (preview.getWidth() <= GL_SIZE_LIMIT && preview.getHeight() <= GL_SIZE_LIMIT) { mPreview = new BitmapTexture(preview); } else { @@ -216,13 +231,26 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource { * than the targetSize, but it will always be less than 2x the targetSize */ private Bitmap decodePreview( - Resources res, Context context, String file, Uri uri, int resId, int targetSize) { + Resources res, Context context, String file, Uri uri, int resId, int targetSize, boolean assetPath) { float scale = (float) targetSize / Math.max(mWidth, mHeight); mOptions.inSampleSize = BitmapUtils.computeSampleSizeLarger(scale); mOptions.inJustDecodeBounds = false; Bitmap result = null; - if (file != null) { + if (file != null && res != null && assetPath) { + try { + AssetManager am = res.getAssets(); + String[] pathImages = am.list(file); + if (pathImages == null || pathImages.length == 0) { + throw new IOException("did not find any images in path: " + file); + } + InputStream is = am.open(file + File.separator + pathImages[0]); + BufferedInputStream bis = new BufferedInputStream(is); + result = BitmapFactory.decodeStream(bis, null, mOptions); + } catch (IOException e) { + Log.w("BitmapRegionTileSource", "getting preview failed", e); + } + } else if (file != null) { result = BitmapFactory.decodeFile(file, mOptions); } else if (uri != null) { try { -- cgit v1.2.3 From 7e0e4fa1b8eb64f71893005f521fc9a27f421944 Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Fri, 2 May 2014 15:07:47 -0700 Subject: Cleaning up references to mDragView after reordering Workspaces Change-Id: I480142b4714034c5579232a6a0d30f3aecb687ac --- src/com/android/launcher3/PagedView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 59b62604c..37cd1e9ca 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -2545,6 +2545,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc protected void onEndReordering() { mIsReordering = false; + mDragView = null; } public boolean startReordering(View v) { -- cgit v1.2.3 From d027815092005de1a63d24ab0c06ea0f982b9843 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Mon, 21 Apr 2014 17:58:55 +0200 Subject: Fix NPE if a moved cell does not have a parent This NPE should actually never happen. It did however and crashed Trebuchet. Symptom that will lead to this NPE: Drag Shortcut from homescreen to somewhere else. Old icon will not get removed while dragging. This should also be fixed! Change-Id: I5b5070c93077e69f0f63a26d337fb9aee83ec6d2 --- src/com/android/launcher3/Workspace.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 83074aeda..376ebb483 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2878,7 +2878,9 @@ public class Workspace extends SmoothPagedView final ItemInfo info = (ItemInfo) cell.getTag(); if (hasMovedLayouts) { // Reparent the view - getParentCellLayoutForView(cell).removeView(cell); + CellLayout parent = getParentCellLayoutForView(cell); + if (parent != null) + parent.removeView(cell); addInScreen(cell, container, screenId, mTargetCell[0], mTargetCell[1], info.spanX, info.spanY); } -- cgit v1.2.3 From aaadc7841203af5492b2cb830cc15bc9375448d7 Mon Sep 17 00:00:00 2001 From: Danesh M Date: Tue, 13 Dec 2011 19:43:20 -0500 Subject: Folders: Merge Folders This allows a folder A's contents to be merged into folder B when folder A is drag/dropped onto folder B. Change-Id: I41d62d04b6b4f0932cc68fb6d2a3be111b063d53 --- src/com/android/launcher3/FolderIcon.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index e80b0f4f2..9b7919b42 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -309,7 +309,8 @@ public class FolderIcon extends LinearLayout implements FolderListener { private boolean willAcceptItem(ItemInfo item) { final int itemType = item.itemType; return ((itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION || - itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) && + itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT || + itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) && !mFolder.isFull() && item != mInfo && !mInfo.opened); } @@ -437,6 +438,15 @@ public class FolderIcon extends LinearLayout implements FolderListener { if (d.dragInfo instanceof AppInfo) { // Came from all apps -- make a copy item = ((AppInfo) d.dragInfo).makeShortcut(); + } else if (d.dragInfo instanceof FolderInfo) { + FolderInfo folder = (FolderInfo) d.dragInfo; + mFolder.notifyDrop(); + for (ShortcutInfo fItem : folder.contents) { + onDrop(fItem, d.dragView, null, 1.0f, mInfo.contents.size(), d.postAnimationRunnable, d); + } + mLauncher.removeFolder(folder); + LauncherModel.deleteItemFromDatabase(mLauncher, folder); + return; } else { item = (ShortcutInfo) d.dragInfo; } -- cgit v1.2.3 From f29645157ef778f245bc5b4f198c85ce585bb482 Mon Sep 17 00:00:00 2001 From: Danesh M Date: Wed, 7 May 2014 10:38:46 -0700 Subject: Trebuchet : Fix overscroll overlay issue When overscrolling in the app drawer, certain effect/page combinations cause the pages to be overlayed. Reproduction : - Have 2 pages in the app drawer - Set scroll effect carousel,rotate up/down - Overscroll one of the pages and let it settle - Should see first and second page stacked together Change-Id: Iaa2b06970e2f5d3dda51ce5bf2259523738f7779 --- .../android/launcher3/AppsCustomizePagedView.java | 29 ---------------------- 1 file changed, 29 deletions(-) diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 7e67f7c60..882cd9dc4 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -233,8 +233,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // Relating to the scroll and overscroll effects private static float TRANSITION_MAX_ROTATION = 22; private static final float ALPHA_CUTOFF_THRESHOLD = 0.01f; - private boolean mOverscrollTransformsSet; - private float mLastOverscrollPivotX; public static boolean DISABLE_ALL_APPS = false; @@ -1489,42 +1487,15 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen if (isInOverscroll) { int index = 0; - float pivotX = 0f; - final float leftBiasedPivot = 0.35f; - final float rightBiasedPivot = 0.65f; final int lowerIndex = 0; final int upperIndex = getChildCount() - 1; final boolean isLeftPage = mOverScrollX < 0; index = (!isRtl && isLeftPage) || (isRtl && !isLeftPage) ? lowerIndex : upperIndex; - pivotX = isLeftPage ? rightBiasedPivot : leftBiasedPivot; - View v = getPageAt(index); - - if (!mOverscrollTransformsSet || Float.compare(mLastOverscrollPivotX, pivotX) != 0) { - mOverscrollTransformsSet = true; - mLastOverscrollPivotX = pivotX; - v.setCameraDistance(mDensity * mCameraDistance); - v.setPivotX(v.getMeasuredWidth() * pivotX); - } - float scrollProgress = getScrollProgress(screenCenter, v, index); float rotation = -TRANSITION_MAX_ROTATION * scrollProgress; v.setRotationY(rotation); - } else { - if (mOverscrollTransformsSet) { - mOverscrollTransformsSet = false; - View v0 = getPageAt(0); - View v1 = getPageAt(getChildCount() - 1); - v0.setRotationY(0); - v1.setRotationY(0); - v0.setCameraDistance(mDensity * mCameraDistance); - v1.setCameraDistance(mDensity * mCameraDistance); - v0.setPivotX(v0.getMeasuredWidth() / 2); - v1.setPivotX(v1.getMeasuredWidth() / 2); - v0.setPivotY(v0.getMeasuredHeight() / 2); - v1.setPivotY(v1.getMeasuredHeight() / 2); - } } } -- cgit v1.2.3 From e1d8965c302938aeeafeaf456348e57f3f8ec417 Mon Sep 17 00:00:00 2001 From: Danesh M Date: Thu, 8 May 2014 12:38:35 -0700 Subject: Revert "Trebuchet : Fix overscroll overlay issue" This reverts commit f29645157ef778f245bc5b4f198c85ce585bb482. Change-Id: Iad637a25ab51ee60bf7a8b3a040abe7d5b709789 --- .../android/launcher3/AppsCustomizePagedView.java | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 882cd9dc4..7e67f7c60 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -233,6 +233,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // Relating to the scroll and overscroll effects private static float TRANSITION_MAX_ROTATION = 22; private static final float ALPHA_CUTOFF_THRESHOLD = 0.01f; + private boolean mOverscrollTransformsSet; + private float mLastOverscrollPivotX; public static boolean DISABLE_ALL_APPS = false; @@ -1487,15 +1489,42 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen if (isInOverscroll) { int index = 0; + float pivotX = 0f; + final float leftBiasedPivot = 0.35f; + final float rightBiasedPivot = 0.65f; final int lowerIndex = 0; final int upperIndex = getChildCount() - 1; final boolean isLeftPage = mOverScrollX < 0; index = (!isRtl && isLeftPage) || (isRtl && !isLeftPage) ? lowerIndex : upperIndex; + pivotX = isLeftPage ? rightBiasedPivot : leftBiasedPivot; + View v = getPageAt(index); + + if (!mOverscrollTransformsSet || Float.compare(mLastOverscrollPivotX, pivotX) != 0) { + mOverscrollTransformsSet = true; + mLastOverscrollPivotX = pivotX; + v.setCameraDistance(mDensity * mCameraDistance); + v.setPivotX(v.getMeasuredWidth() * pivotX); + } + float scrollProgress = getScrollProgress(screenCenter, v, index); float rotation = -TRANSITION_MAX_ROTATION * scrollProgress; v.setRotationY(rotation); + } else { + if (mOverscrollTransformsSet) { + mOverscrollTransformsSet = false; + View v0 = getPageAt(0); + View v1 = getPageAt(getChildCount() - 1); + v0.setRotationY(0); + v1.setRotationY(0); + v0.setCameraDistance(mDensity * mCameraDistance); + v1.setCameraDistance(mDensity * mCameraDistance); + v0.setPivotX(v0.getMeasuredWidth() / 2); + v1.setPivotX(v1.getMeasuredWidth() / 2); + v0.setPivotY(v0.getMeasuredHeight() / 2); + v1.setPivotY(v1.getMeasuredHeight() / 2); + } } } -- cgit v1.2.3 From 73da300a628435dac32da5630e33057ae5c03cd9 Mon Sep 17 00:00:00 2001 From: Danesh M Date: Thu, 8 May 2014 14:14:39 -0700 Subject: Trebuchet : Only reset overscrolled child Change-Id: Ief240c7fbbe296673ff4124cd4d463c9ba65f764 --- src/com/android/launcher3/AppsCustomizePagedView.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 7e67f7c60..ed504cf2e 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -1514,16 +1514,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } else { if (mOverscrollTransformsSet) { mOverscrollTransformsSet = false; - View v0 = getPageAt(0); - View v1 = getPageAt(getChildCount() - 1); + View v0 = getPageAt(mCurrentPage); v0.setRotationY(0); - v1.setRotationY(0); v0.setCameraDistance(mDensity * mCameraDistance); - v1.setCameraDistance(mDensity * mCameraDistance); v0.setPivotX(v0.getMeasuredWidth() / 2); - v1.setPivotX(v1.getMeasuredWidth() / 2); v0.setPivotY(v0.getMeasuredHeight() / 2); - v1.setPivotY(v1.getMeasuredHeight() / 2); } } } -- cgit v1.2.3 From 62316414fc295456cf980e387a27e9236cba75ac Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 9 May 2014 01:06:13 +0300 Subject: Automatic translation import Change-Id: I7826b798d4ba852af567e895bd4850a7eea599d9 --- res/values-af/cm_strings.xml | 14 +++++++++ res/values-ar/cm_strings.xml | 21 +++++++++++-- res/values-ca/cm_strings.xml | 17 ++++++++++- res/values-cs/cm_strings.xml | 15 ++++++++++ res/values-da/cm_strings.xml | 15 ++++++++++ res/values-de/cm_strings.xml | 15 ++++++++++ res/values-el/cm_strings.xml | 15 ++++++++++ res/values-es-rXA/cm_strings.xml | 15 ++++++++++ res/values-es/cm_strings.xml | 15 ++++++++++ res/values-fi/cm_strings.xml | 15 ++++++++++ res/values-fr/cm_strings.xml | 15 ++++++++++ res/values-hu/cm_strings.xml | 15 ++++++++++ res/values-it/cm_strings.xml | 15 ++++++++++ res/values-iw/cm_strings.xml | 17 +++++++++++ res/values-ja/cm_strings.xml | 14 +++++++++ res/values-lb/cm_arrays.xml | 40 +++++++++++++++++++++++++ res/values-lb/cm_strings.xml | 53 +++++++++++++++++++++++++++++++++ res/values-lt/cm_strings.xml | 15 ++++++++++ res/values-nl/cm_strings.xml | 17 ++++++++++- res/values-pt-rBR/cm_strings.xml | 15 ++++++++++ res/values-pt-rPT/cm_strings.xml | 15 ++++++++++ res/values-ru/cm_strings.xml | 15 ++++++++++ res/values-sk/cm_strings.xml | 15 ++++++++++ res/values-sr/cm_strings.xml | 27 +++++++++++++---- res/values-sv/cm_arrays.xml | 40 +++++++++++++++++++++++++ res/values-sv/cm_strings.xml | 64 ++++++++++++++++++++++++++++++++++++++++ res/values-tr/cm_strings.xml | 18 +++++++++++ res/values-zh-rHK/cm_strings.xml | 1 + 28 files changed, 557 insertions(+), 11 deletions(-) create mode 100644 res/values-lb/cm_arrays.xml create mode 100644 res/values-lb/cm_strings.xml create mode 100644 res/values-sv/cm_arrays.xml create mode 100644 res/values-sv/cm_strings.xml diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml index 866924345..cc273425a 100644 --- a/res/values-af/cm_strings.xml +++ b/res/values-af/cm_strings.xml @@ -32,7 +32,19 @@ Tuis skerm Soekbalk Wys soekbalk altyd aan die bokant van die skerm + Steek ikoon etikette weg + Steek ikoon etikette op Tuis Skerm weg Laai + Program en legstuk laai + Programme + Versteekte programme + Steek programme van die laai weg + Verwyder kortpaaie + Verwyder kortpaaie of versteekte programme van die tuis skerm + Verwyder legstukke + Verwyder legstukke of versteekte programme van die tuis skerm + Steek ikoon etikette weg + Steek ikoon etikette weg in die laai Dok Algemeen Ikone @@ -46,4 +58,6 @@ Geen ikoon stelle geïnstalleer Verpersoonlik jou laai Tik die bladsy aanwyser vir bykomende konfigurasie-instellings + Herstel + Versteekte programme diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml index c701b720c..d0161cdce 100644 --- a/res/values-ar/cm_strings.xml +++ b/res/values-ar/cm_strings.xml @@ -32,18 +32,33 @@ الشاشة الرئيسية شريط البحث إستمرار إظهار شريط البحث في أعلى الشاشة - السحاب + إخفاء تسميات الرمز + إخفاء تسميات الرموز على الشاشة الرئيسية + الفراغ + فراغ التطبيقات والمصغرات + تطبيقات + تطبيقات المخفية + إخفاء تطبيقات من الفراغ + إزالة اختصارات + إزالة الاختصارات للتطبيقات المخفية من الشاشة الرئيسية + إزالة المصغرات + إزالة مصغرات التطبيقات المخفية من الشاشة الرئيسية + إخفاء تسميات الرمز + إخفاء تسميات الرمز في الفراغ حوض عام أيقونات أيقونات كبيرة - استخدام الرموز إضافية كبيرة لي التطبيق في الشاشة الرئيسية و السحاب + استخدام الرموز إضافية كبيرة لي التطبيق في الشاشة الرئيسية و الفراغ نمط خط النص شكل ونمط الخط لاستخدامه لرمز النص اختر حزمة الأيقونة الإيقونات الافتراضية حزم الإيقونات لا توجد حزم أيقونات لتثبيت - تخصيص السحاب + تصفية + تخصيص الفراغ انقر فوق مؤشر الصفحة لعرض إعدادات التكوين الإضافي + إعادة تعيين + تطبيقات المخفية diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml index 841074b66..ff387a6e1 100644 --- a/res/values-ca/cm_strings.xml +++ b/res/values-ca/cm_strings.xml @@ -32,18 +32,33 @@ Pantalla d\'inici Barra de cerca Mostra sempre la barra de cerca a la part superior de la pantalla + Amaga les etiquetes de les icones + Amaga les etiquetes de les icones de la pantalla d\'inici Calaix + Calaix d\'apps i widgets + Apps + Apps amagades + Amaga les apps del calaix + Treu les dreceres + Treu les dreceres de les apps amagades de la pantalla d\'inici + Treu els widgets + Treu els widgets de les apps amagades de la pantalla d\'inici + Amaga les etiquetes de les icones + Amaga les etiquetes de les icones al calaix Barra d\'aplicacions General Icones Icones més grans Utilitza icones d\'aplicació extra grans a la pantalla d\'inici i al calaix - Estil de tipus de lletra del text + Estil del tipus de lletra del text Variant i estil del tipus de lletra pel text de les icones Escull un paquet d\'icones Icones per defecte Paquets d\'icones No hi ha paquets d\'icones instal·lats + Neteja Personalitza el teu calaix Pica l\'indicador de pàgina per veure les opcions de configuració addicionals + Reinicia + Apps amagades diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml index a298ba60a..449e1db3a 100644 --- a/res/values-cs/cm_strings.xml +++ b/res/values-cs/cm_strings.xml @@ -32,7 +32,19 @@ Domovská plocha Vyhledávací lišta Trvale zobrazit lištu vyhledávání vždy u horní hrany plochy + Skrýt popisky ikon + Skrýt popisky ikon na domovské ploše Aplikační složka + Složka aplikací a widgetů + Aplikace + Skryté aplikace + Skrýt aplikace ve složce + Odebrat zástupce + Odebrat zástupce skrytých aplikací z domovské plochy + Odebrat widgety + Odebrat widgety skrytých aplikací z domovské plochy + Skrýt popisky ikon + Skrýt popisky ikon ve složce Dok Obecné Ikony @@ -44,6 +56,9 @@ Výchozí ikony Balíčky ikon Není nainstalován žádný balíček ikon + Odstranit Upravit vlastní složku Dotykem na indikátor stránky zobrazit další možnosti nastavení + Obnovit + Skryté aplikace diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml index 68200dd22..0149c9c91 100644 --- a/res/values-da/cm_strings.xml +++ b/res/values-da/cm_strings.xml @@ -32,7 +32,19 @@ Startskærm Søgelinje Vis permanent søgelinje i toppen af skærmen + Skjul ikontekster + Skjul ikontekster på startskærmen Oversigt + Oversigt over apps og widgets + Apps + Skjulte apps + Skjul apps fra oversigten + Fjern genveje + Fjern genveje til skjulte apps fra startskærmen + Fjern widgets + Fjern widgets fra skjulte apps fra startskærmen + Skjul ikontekster + Skjul ikontekster i oversigten Docklinje Generelt Ikoner @@ -44,6 +56,9 @@ Standardikoner Ikonpakker Ingen ikonpakker installeret + Ryd Tilpas din oversigt Tryk på sideindikatoren for at vise yderligere konfigurationsindstillinger + Nulstil + Skjulte apps diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml index 4e46c4081..8e784472e 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml @@ -32,7 +32,19 @@ Startbildschirm Suchleiste Dauerhafte Anzeige der Suchleiste am oberen Bildschirmrand + Beschriftung nicht anzeigen + Symbolbeschriftungen auf den Startseiten ausblenden App-Übersicht + App- und Widget-Übersicht + Apps + Versteckte Apps + Apps in der App-Übersicht verstecken + Verknüpfungen entfernen + Verknüpfungen für versteckte Apps vom Startbildschirm entfernen + Widgets entfernen + Widgets von versteckten Apps vom Startbildschirm entfernen + Beschriftung nicht anzeigen + Symbolbeschriftungen in der App-Übersicht ausblenden Dock Allgemein Symbole @@ -44,6 +56,9 @@ Standardsymbole Symbolpakete Es sind keine Symbolpakete installiert + Zurücksetzen App-Übersicht konfigurieren Berühren Sie den Seitenindikator, um die erweiterten Einstellungen zu öffnen. + Zurücksetzen + Versteckte Apps diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml index b39a8f3b5..df3a2a6bb 100644 --- a/res/values-el/cm_strings.xml +++ b/res/values-el/cm_strings.xml @@ -32,7 +32,19 @@ Αρχική οθόνη Μπάρα αναζήτησης Εμφάνιση της μπάρας αναζήτησης στο πάνω μέρος της οθόνης + Απόκρυψη ετικετών εικονιδίων + Απόκρυψη ετικετών εικονιδίων στην αρχική οθόνη Συρτάρι + Συρτάρι εφαρμογών και widget + Εφαρμογές + Κρυμμένες εφαρμογές + Απόκρυψη εφαρμογών από το συρτάρι + Αφαίρεση συντομεύσεων + Αφαίρεση συντομεύσεων των κρυμμένων εφαρμογών από την αρχική οθόνη + Αφαίρεση widget + Αφαίρεση widget των κρυμμένων εφαρμογών από την αρχική οθόνη + Απόκρυψη ετικετών εικονιδίων + Απόκρυψη ετικετών εικονιδίων στο συρτάρι Μπάρα εφαρμογών Γενικά Εικονίδια @@ -44,6 +56,9 @@ Προεπιλεγμένα εικονίδια Πακέτα εικονιδίων Δεν υπάρχουν εγκατεστημένα πακέτα εικονιδίων + Εκκαθάριση Προσαρμόστε το συρτάρι σας Αγγίξτε την ένδειξη σελίδας για προβολή πρόσθετων ρυθμίσεων + Επαναφορά + Κρυμμένες εφαρμογές diff --git a/res/values-es-rXA/cm_strings.xml b/res/values-es-rXA/cm_strings.xml index 2f9778814..df3dedecb 100644 --- a/res/values-es-rXA/cm_strings.xml +++ b/res/values-es-rXA/cm_strings.xml @@ -32,7 +32,19 @@ Pantalla d\'aniciu Barra de gueta Habilitar permantentemente la barra de gueta + Anubrir etiquetes de los iconos + Anubrir les etiquetes de los iconos na pantalla d\'aniciu Aplicaciones + Aplicaciones y widgets + Aplicaciones + Aplicaciones anubríes + Anubrir aplicaciones pa que nun s\'amuesen + Desaniciar atayos + Desaniciar atayos d\'aplicaciones anubríes de la pantalla d\'aniciu + Desaniciar widgets + Desaniciar widgets d\'aplicaciones anubríes de la pantalla d\'aniciu + Anubrir etiquetes de los iconos + Anubrir les etiquetes de los iconos de la pantalla d\'aniciu Barra d\'aplicaciones Xeneral Iconos @@ -44,6 +56,9 @@ Iconos por defeutu Paquetes d\'iconos Nun hai paquetes d\'iconos instalaos + Llimpiar Personaliza les tos aplicaciones Primi l\'indicador de páxina p\'amosar axustes adicionales + Restablecer + Aplicaciones anubríes diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml index 733dee6b9..e0478d8ea 100644 --- a/res/values-es/cm_strings.xml +++ b/res/values-es/cm_strings.xml @@ -32,7 +32,19 @@ Pantalla de inicio Barra de búsqueda Habilitar la barra de búsqueda permanentemente + Ocultar etiquetas + Ocultar las etiquetas de los iconos en la pantalla de inicio Aplicaciones + Aplicaciones y widgets + Aplicaciones + Ocultar aplicaciones + Ocultar aplicaciones para que no se muestren + Eliminar iconos + Eliminar iconos de aplicaciones ocultas de la pantalla de inicio + Eliminar widgets + Eliminar widgets de aplicaciones ocultas de la pantalla de inicio + Ocultar etiquetas + Ocultar las etiquetas de los iconos de la pantalla de inicio Barra de aplicaciones General Iconos @@ -44,6 +56,9 @@ Iconos por defecto Paquetes de iconos No hay paquetes de iconos instalados + Limpiar Personalizar tus aplicaciones Tocar el indicador de página para mostrar ajustes adicionales + Restablecer + Ocultar aplicaciones diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml index 1453e70b2..679510ca5 100644 --- a/res/values-fi/cm_strings.xml +++ b/res/values-fi/cm_strings.xml @@ -32,7 +32,19 @@ Kotinäyttö Hakupalkki Näytä pysyvä hakupalkki näytön yläreunassa + Piilota kuvakkeiden tekstit + Piilota kuvakkeiden tekstit kotinäytöllä Sovellusvalikko + Sovellus- ja widgetvalikko + Sovellukset + Piilotetut sovellukset + Piilota sovellukset valikosta + Poista kuvakkeet + Poista piilotettujen sovellusten kuvakkeet kotinäytöltä + Poista widgetit + Poista piilotettujen sovellusten widgetit kotinäytöltä + Piilota kuvakkeiden tekstit + Piilota kuvakkeiden tekstit valikossa Alapalkki Yleiset Kuvakkeet @@ -44,6 +56,9 @@ Oletuskuvakkeet Kuvakepaketit Kuvakepaketteja ei asennettu + Tyhjennä Muokkaa sovellusvalikkoa Napauta sivun ilmaisinta nähdäksesi lisää asetuksia + Nollaa + Piilotetut sovellukset diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml index ea5d6de13..1ba03261b 100644 --- a/res/values-fr/cm_strings.xml +++ b/res/values-fr/cm_strings.xml @@ -32,7 +32,19 @@ Écran d\'accueil Barre de recherche Afficher la barre de recherche persistante en haut de l\'écran + Masquer le nom des icônes + Masquer le nom des icônes sur l\'écran d\'accueil Liste d\'applications + Applications et widgets de la liste des applications + Applications + Applications masquées + Masquer les applications de la liste des applications + Supprimer les raccourcis + Supprimer les raccourcis sur l\'écran d\'accueil des applications masquées + Supprimer les widgets + Supprimer les widgets sur l\'écran d\'accueil des applications masquées + Masquer le nom des icônes + Masquer le nom des icônes dans la liste des applications Dock Général Icônes @@ -44,6 +56,9 @@ Icônes par défaut Packs d\'icônes Aucun pack d\'icônes installé + Supprimer Personnaliser votre affichage Appuyez sur l\'indicateur de page pour afficher les paramètres de configuration supplémentaires + Réinitialiser + Applications masquées diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml index ff2bad920..434fd319e 100644 --- a/res/values-hu/cm_strings.xml +++ b/res/values-hu/cm_strings.xml @@ -32,7 +32,19 @@ Kezdőképernyő Keresési sáv Állandó keresési sáv megjelenítése a képernyő felső + Ikon feliratok elrejtése + Elrejti a kezdőképernyőn lévő ikonok neveit Alkalmazásképernyők + Alkalmazások és modulok + Alkalmazások + Rejtett alkalmazások + Alkalmazások elrejtése az alkalmazásképernyőről + Rejtett alkalmazások (parancsikonok) + Rejtett alkalmazások ikonjainak eltávolítása + Rejtett alkalmazások (modulok) + Rejtett alkalmazás moduljának eltávolítása + Ikon feliratok elrejtése + Ikon feliratok elrejtése az alkalmazásképernyőkről Dokkoló Általános Ikonok @@ -44,6 +56,9 @@ Alapértelmezett ikonok Ikon csomagok Nincsenek telepítve ikoncsomagok + Törlés Alkalmazásképernyők testreszabása Érintse meg az oldaljelölőt a további konfigurációs beállítások megtekintéséhez + Visszaállítás + Rejtett alkalmazások diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml index 5e388d740..c3c0743e1 100644 --- a/res/values-it/cm_strings.xml +++ b/res/values-it/cm_strings.xml @@ -32,7 +32,19 @@ Schermata Home Barra di ricerca Mostra la barra di ricerca persistente nella parte superiore dello schermo + Nascondi etichette icone + Nascondi le etichette delle icone sulla schermata Home Drawer + Drawer app e widget + App + App nascoste + Nascondi le app dal drawer + Rimuovi scorciatoie + Rimuovi le scorciatoie delle app nascoste dalla schermata Home + Rimuovi widget + Rimuovi i widget delle app nascoste dalla schermata Home + Nascondi etichette icone + Nascondi le etichette delle icone nel drawer Dock Generale Icone @@ -44,6 +56,9 @@ Icone predefinite Pacchetti icone Nessun pacchetto di icone installato + Svuota Personalizza il drawer Tocca l\'indicatore della pagina per visualizzare le impostazioni di configurazione aggiuntive + Ripristina + App nascoste diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml index 32e38a205..b8391073d 100644 --- a/res/values-iw/cm_strings.xml +++ b/res/values-iw/cm_strings.xml @@ -25,13 +25,26 @@ מספר הפעלות זמן התקנה תיאור דף + עימום דפים צדדיים גלילת טפט העדפות יישום מסך הבית סרגל החיפוש הצג את שורת החיפוש תמיד בחלק העליון של המסך + הסתר תוויות הסמלים + הסתר תוויות הסמלים על מסך הבית מגירה + מגירת הווידג\'טים והיישומים + יישומים + יישומים מוסתרים + הסתר יישומים מהמגירה + הסר קיצורי דרך + הסר את קיצורי הדרך של היישומים המוסתרים ממסך הבית + הסר ווידג\'טים + הסר את הווידג\'טים של היישומים המוסתרים ממסך הבית + הסתר תוויות הסמלים + הסתר תוויות הסמלים במגירה עגינה כללי סמלים @@ -43,4 +56,8 @@ סמלי ברירת מחדל אוסף סמלים לא מותקנות ערכות סמל + התאמה אישית של מגירת היישומים + הקש על מחוון הדף כדי להציג הגדרות נוספות + אפס + יישומים מוסתרים diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml index c32c7969c..eb6f43f67 100644 --- a/res/values-ja/cm_strings.xml +++ b/res/values-ja/cm_strings.xml @@ -32,7 +32,19 @@ ホーム画面 検索バー 画面の上部に検索バーを常に表示する + アイコンラベルを非表示にする + ホーム画面でアイコンラベルを非表示にする ドロワー + アプリとウィジェットのドロワー + アプリ + 非表示にするアプリ + ドロワーからアプリを非表示にする + ショートカットを削除 + ホーム画面から非表示にしたアプリのショートカットを削除する + ウィジェットを削除 + ホーム画面から非表示にしたアプリのウィジェットを削除する + アイコンラベルを非表示にする + ドロワーでアイコンラベルを非表示にする ドック 全般 アイコン @@ -46,4 +58,6 @@ アイコンパックがインストールされていません ドロワーをカスタマイズ 追加の構成設定を表示するには、ページインジケータをタップします。 + リセット + 非表示にするアプリ diff --git a/res/values-lb/cm_arrays.xml b/res/values-lb/cm_arrays.xml new file mode 100644 index 000000000..6074c5ac9 --- /dev/null +++ b/res/values-lb/cm_arrays.xml @@ -0,0 +1,40 @@ + + + + + + Normal + Dënn + Schmuel + + + Keen + Erazoomen + Erauszoomen + Eroprotéieren + Erofrotéieren + Wierfel bannen + Wierfel baussen + Koup + Akkordeon + Ëmdréinen + Zylinder bannen + Zylinder baussen + Karussell + Iwwersiicht + + diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml new file mode 100644 index 000000000..19a760f55 --- /dev/null +++ b/res/values-lb/cm_strings.xml @@ -0,0 +1,53 @@ + + + + + Copyright \u00A9 2014 The CyanogenMod Project + Zortéieren + Filteren + Standardsäit + Scrolleffekt + Titel + Startunzuel + Installatiounszäit + Säiterummen + Säiten um Rand ausblenden + Hannergrondbild scrollen + Astellungen + App + Startschierm + Sichkëscht + D\'Sichfeld um ieweschte Bord vum Schierm ëmmer uweisen + App-Iwwersiicht + Apps + Ofkierzungen ewechhuelen + Widgets ewechhuelen + Dock + Allgemeng + Symboler + Grouss Symboler + Grouss Symboler fir d\'Apps um Startschierm a bei der App-Iwwersiicht benotzen + Schrëftstil + Schrëftaart a -stil vum Text ënner de Symboler + Symbolpak auswielen + Standardsymboler + Symbolpäck + Keng Symbolpäck installéiert + App-Iwwersiicht konfiguréieren + Dréck de Säitenindikator fir zousätzlech Astellungen ze gesinn + Zrécksetzen + diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml index 9f046b2e1..e4ffbbf75 100644 --- a/res/values-lt/cm_strings.xml +++ b/res/values-lt/cm_strings.xml @@ -32,7 +32,19 @@ Pagrindinis ekranas Paieškos juosta Rodyti nuolatinę paieškos juostą ekrano viršuje + Paslėpti piktogramų pavadinimus + Paslėpti piktogramų pavadinimus pagrindiniame ekrane Stalčius + Programų ir valdiklių stalčius + Programos + Paslėptos programos + Paslėpti programas iš stalčiaus + Pašalinti nuorodas + Pašalinti paslėptų programų nuorodas iš pagrindinio ekrano + Pašalinti valdiklius + Pašalinti paslėptų programų valdiklius iš pagrindinio ekrano + Paslėpti piktogramų pavadinimus + Paslėpti piktogramų pavadinimus iš stalčiaus Dokas Bendra Piktogramos @@ -44,6 +56,9 @@ Numatytosios piktogramos Piktogramų paketai Piktogramų paketai neįdiegti + Išvalyti Tinkinti savo stalčių Bakstelėkite puslapio indikatorių norėdami peržiūrėti papildomus konfigūracijos nustatymus + Atkurti + Paslėptos programos diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml index 30ee40934..bf5021141 100644 --- a/res/values-nl/cm_strings.xml +++ b/res/values-nl/cm_strings.xml @@ -20,7 +20,7 @@ Sorteren Filteren Standaard\nscherm - Overgangseffect + Overgangs\neffect Titel Aantal starts Tijd van installatie @@ -32,7 +32,19 @@ Startscherm Zoekbalk Zoekbalk permanent tonen bovenaan het scherm + Labels verbergen + Labels verbergen onder pictogrammen op het startscherm Overzicht + App- en widgetoverzicht + Apps + Verborgen apps + Apps verbergen in het app-overzicht + Snelkoppelingen verbergen + Snelkoppelingen van verborgen apps niet weergeven op startscherm + Widgets verbergen + Widgets van verborgen apps niet weergeven op startscherm + Labels verbergen + Labels verbergen onder pictogrammen in het appoverzicht Dock Algemeen Pictogrammen @@ -44,6 +56,9 @@ Standaard Pictogram\npakket Geen pictogrampakketten geïnstalleerd + Verwijderen App-overzicht aanpassen Tik op de pagina-indicator voor extra instellingen + Opnieuw instellen + Verborgen apps diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml index 573021061..01381a48e 100644 --- a/res/values-pt-rBR/cm_strings.xml +++ b/res/values-pt-rBR/cm_strings.xml @@ -32,7 +32,19 @@ Tela Inicial Barra de pesquisa Exibir barra de pesquisa persistente no topo da tela + Ocultar as legendas dos ícones + Oculta as legendas dos ícones na tela inicial Gaveta de apps + Gaveta de aplicativos e widgets + Aplicativos + Aplicativos ocultos + Ocultar aplicativos da gaveta + Remover atalhos + Remover os atalhos de aplicativos ocultos da tela inicial + Remover widgets + Remover os widgets dos aplicativos ocultos da tela inicial + Ocultar as legendas dos ícones + Ocultar as legendas dos ícones na gaveta Dock Geral Ícones @@ -44,6 +56,9 @@ Ícones padrão Pacote de ícones Nenhum pacote de ícones instalado + Limpar Personalizar sua gaveta de aplicativos Toque o indicador desta página para visualizar configurações adicionais + Redefinir + Aplicativos ocultos diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml index 980ee22c6..127a341d6 100644 --- a/res/values-pt-rPT/cm_strings.xml +++ b/res/values-pt-rPT/cm_strings.xml @@ -32,7 +32,19 @@ Ecrã inicial Barra de pesquisa Mostrar barra de pesquisa persistente no topo do ecrã + Ocultar as legendas dos ícones + Oculta as legendas dos ícones no ambiente de trabalho Gaveta de aplicações + Gaveta de aplicações e widgets + Aplicações + Aplicações ocultas + Ocultar aplicações da gaveta + Remover atalhos + Remover os atalhos de aplicações ocultas do ambiente de trabalho + Remover widgets + Remover os widgets das aplicações ocultas do ambiente de trabalho + Ocultar as legendas dos ícones + Ocultar as legendas dos ícones na gaveta de aplicações Dock Geral Ícones @@ -44,6 +56,9 @@ Ícones padrão Pacotes de Ícones Nenhum pacote de ícones instalado + Limpar Personalize a sua gaveta de aplicações Toque no indicador de página para ver definições adicionais + Restaurar + Aplicações ocultas diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml index d3009928c..af3f3baa0 100644 --- a/res/values-ru/cm_strings.xml +++ b/res/values-ru/cm_strings.xml @@ -32,7 +32,19 @@ Домашний экран Строка поиска Показывать постоянную строку поиска вверху экрана + Скрывать подписи значков + Не отображать текст у ярлыков на домашнем экране Меню приложений + Список приложений и виджетов + Приложения + Скрытые приложения + Выбрать приложения, которые не будут отображаться в меню + Удалять ярлыки + Убирать ярлыки скрытых приложений с домашнего экрана + Удалять виджеты + Убирать виджеты скрытых приложений с домашнего экрана + Скрывать подписи значков + Не отображать текст у ярлыков в меню приложений Нижняя панель Общие Значки @@ -44,6 +56,9 @@ Значки по умолчанию Наборы значков Наборы значков не установлены + Очистить Настройте меню приложений по своему вкусу Коснитесь индикатора страницы внизу для перехода к настройкам. + Сброс + Скрытые приложения diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml index c26ef915c..6a78d0a7d 100644 --- a/res/values-sk/cm_strings.xml +++ b/res/values-sk/cm_strings.xml @@ -32,7 +32,19 @@ Domovská obrazovka Vyhľadávací panel Zobraziť pretrvávajúci vyhľadávací panel v hornej časti obrazovky + Skryť menovky ikon + Skryť menovky ikon z domovskej obrazovky Ponuka aplikácií + Aplikácie a miniaplikácie ponuky + Aplikácie + Skryté aplikácie + Skryť aplikácie zo zoznamu aplikácií + Vymazať odkazy + Vymazať odkazy skrytých aplikácií z domovskej obrazovky + Vymazať miniaplikácie + Vymazať miniaplikácie skrytých aplikácií z domovskej obrazovky + Skryť menovky ikon + Skryť menovky ikon v ponuke aplikácií Dok Všeobecné Ikony @@ -44,6 +56,9 @@ Predvolené ikony Balíky ikon Žiadne balíky ikon nie sú nainštalované + Vymazať Prispôsobte si vašu ponuku Kliknite na ukazovateľ stránky pre zobrazenie ďalších nastavení + Obnoviť + Skryté aplikácie diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml index 94b204b37..04ef3fa4d 100644 --- a/res/values-sr/cm_strings.xml +++ b/res/values-sr/cm_strings.xml @@ -17,12 +17,12 @@ --> Copyright \u00A9 2014 The CyanogenMod Project - Врста + Приказ Филтер Подразумевани екран Ефекат скроловања Наслов - Тачка покретања + Број покретања Време инсталирања Контура странице Замагљени крајеви страница @@ -30,20 +30,35 @@ Подешавања Апликације Почетни екран - Табла за претраживање - Покажите упорну таблу за претраживање на врху екрана + Табла за претрагу + Прикажи упорну таблу за претрагу на врху екрана + Сакриј етикете икона + Сакријте етикете икона на почетном екрану Фиока + Фиока за апликације и виџете + Апликације + Скривене апликације + Сакријте апликације из фиоке + Уклони пречице + Уклоните пречице скривених апликација са почетног екрана + Уклони виџете + Уклоните виџете скривених апликација са почетног екрана + Сакриј етикете икона + Сакријте етикете икона у фиоци Доцк Oпште Иконе Веће иконе - Користите екстра велике апликационе иконе на почетном екрану и у фиоци + Користите екстра велике апликационе иконе на почетном екрану и фиоци Стил фонта текста Варијанту и стил фонта користити за текст на иконама Одаберите пакет икона Подразумеване иконе Пакети икона Нема инсталираних пакета са иконама + Чисто Прилагодите фиоку - Додирните индикатор странице да видите додатна подешавања конфигурације + Додирните индикатор странице да би сте видели додатна подешавања + Ресетовање + Скривене апликације diff --git a/res/values-sv/cm_arrays.xml b/res/values-sv/cm_arrays.xml new file mode 100644 index 000000000..fddfd9e11 --- /dev/null +++ b/res/values-sv/cm_arrays.xml @@ -0,0 +1,40 @@ + + + + + + Vanlig + Ljus + Kondenserad + + + Ingen + Zooma In + Zooma ut + Rotera upp + Rotera ner + Kub in + Kub ut + Stack + Dragspel + Flip + Cylinder in + Cylinder ut + Karusell + Översikt + + diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml new file mode 100644 index 000000000..530ebab3a --- /dev/null +++ b/res/values-sv/cm_strings.xml @@ -0,0 +1,64 @@ + + + + + Copyright \u00A9 2014 The CyanogenMod Project + Sortera + Filtrera + Standardskärm + Rullningseffekt + Titel + Startantal + Installationstillfälle + Skärmkonturer + Tona skärmsidor + Rulla bakgrundsbild + Inställningar + App + Hemskärm + Sökfält + Visa beständigt sökfält längst upp på skärmen + Dölj ikonetiketter + Dölj ikonetiketter på hemskärmen + Appmeny + App- och widgetmeny + Appar + Gömda appar + Göm appar från menyn + Ta bort genvägar + Ta bort genvägarna till gömda appar från hemskärmen + Ta bort widgetar + Ta bort widgetarna från gömda appar från hemskärmen + Göm ikonetiketter + Göm ikonetiketter i appmenyn + Docka + Allmänt + Ikoner + Större ikoner + Använda extra stora appikoner på hemskärmen och appmenyn + Typsnitt + Variant och stil på typsnitt som används för ikontext + Välj ikonpaket + Standardikoner + Ikonpaket + Inga ikonpaket installerade + Ta bort + Anpassa din appmeny + Tryck på sidindikatorn för att se ytterligare inställningar + Återställ + Gömda appar + diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml index fc9bd2eef..a2754e234 100644 --- a/res/values-tr/cm_strings.xml +++ b/res/values-tr/cm_strings.xml @@ -19,7 +19,10 @@ Telif Hakkı \u00A9 2014 CyanogenMod Projesi Sırala Filtrele + Varsayılan ekran + Kaydırma efekti Başlık + Kurulum zamanı Sayfa anahatları Yan sayfaları soldur Duvarkağıdını kaydır @@ -28,7 +31,19 @@ Ana Ekran Arama kutusu Ekranın üstünde kalıcı arama çubuğu göster + Simge etiketlerini gizle + Ana ekranda simge etiketlerini gizle Uygulama çekmecesi + Uygulama ve widget çekmecesi + Uygulamalar + Gizli uygulamalar + Uygulamaları menüden gizle + Kısayolları kaldır + Ana ekrandan gizli uygulamaların kısayollarını kaldır + Ekran araçlarını kaldır + Ana ekrandan gizli uygulamaların widgetlarını kaldır + Simge etiketlerini gizle + Çekmecedeki simge etiketlerini gizle Kilit Genel Simgeler @@ -40,6 +55,9 @@ Varsayılan simgeler Simge paketleri Yüklü simge paketi yok + Temizle Uygulama çekmecesini özelleştir Ek ayarlara bakmak için sayfa göstergesine dokun + Sıfırla + Gizli uygulamalar diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml index fe9706723..140c9bc27 100644 --- a/res/values-zh-rHK/cm_strings.xml +++ b/res/values-zh-rHK/cm_strings.xml @@ -20,5 +20,6 @@ 預設螢幕 啟動次數 滾動牆紙 + 設定 預設圖示 -- cgit v1.2.3 From 98adac0552dd188c2241636a2ddb7d1538f26f81 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 26 Apr 2014 12:38:58 +0200 Subject: Fix name of default Change-Id: I562dc2572f1d8fdb69f615d1a7f0f425cc27d698 --- res/values/preferences_defaults.xml | 2 +- res/xml/preferences_homescreen.xml | 2 +- src/com/android/launcher3/Folder.java | 4 ++-- src/com/android/launcher3/Launcher.java | 2 +- src/com/android/launcher3/Workspace.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml index 9d8e5f010..98d8bb7a8 100644 --- a/res/values/preferences_defaults.xml +++ b/res/values/preferences_defaults.xml @@ -5,7 +5,7 @@ true @bool/config_workspaceDefaultShowOutlines @bool/config_workspaceFadeAdjacentScreens - false + false stack false false diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml index 4671a8a4a..1754cfa02 100644 --- a/res/xml/preferences_homescreen.xml +++ b/res/xml/preferences_homescreen.xml @@ -25,5 +25,5 @@ + android:defaultValue="@bool/preferences_interface_homescreen_hide_icon_labels_default" /> diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 1fcfa1173..a00f3c1da 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -195,7 +195,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList if (SettingsProvider.getBoolean(mLauncher, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, - R.bool.preferences_interface_homescreen_hide_icon_labels)) { + R.bool.preferences_interface_homescreen_hide_icon_labels_default)) { mFolderName.setVisibility(View.GONE); mFolderNameHeight = getPaddingBottom(); } @@ -276,7 +276,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList String newTitle = mFolderName.getText().toString(); if (!SettingsProvider.getBoolean(mLauncher, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, - R.bool.preferences_interface_homescreen_hide_icon_labels)) { + R.bool.preferences_interface_homescreen_hide_icon_labels_default)) { mInfo.setTitle(newTitle); } LauncherModel.updateItemInDatabase(mLauncher, mInfo); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 29618422d..383204817 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -391,7 +391,7 @@ public class Launcher extends Activity mHideIconLabels = SettingsProvider.getBoolean(this, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, - R.bool.preferences_interface_homescreen_hide_icon_labels); + R.bool.preferences_interface_homescreen_hide_icon_labels_default); // Determine the dynamic grid properties Point smallestSize = new Point(); diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 376ebb483..37bd8aa73 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -315,7 +315,7 @@ public class Workspace extends SmoothPagedView R.bool.preferences_interface_homescreen_scrolling_page_outlines_default); mHideIconLabels = SettingsProvider.getBoolean(context, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, - R.bool.preferences_interface_homescreen_hide_icon_labels); + R.bool.preferences_interface_homescreen_hide_icon_labels_default); mWorkspaceFadeInAdjacentScreens = SettingsProvider.getBoolean(context, SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT, R.bool.preferences_interface_homescreen_scrolling_fade_adjacent_default); -- cgit v1.2.3