aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Move IconNormalizer/ShadowGenerator/LauncherIcons to icons package" into ub-launcher3-master

Browse Source
This commit is contained in:
Hyunyoung Song
2018-09-26 19:12:42 +00:00
committed by Android (Google) Code Review
parent bb517d3b25 48cb7bc7a4
commit 3d6fa5205b
32 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/quickstep/NormalizedIconLoader.java
View File

@@ -28,9 +28,9 @@ import android.util.LruCache;
import android.util.SparseArray;
import com.android.launcher3.FastBitmapDrawable;
import com.android.launcher3.graphics.BitmapInfo;
import com.android.launcher3.icons.BitmapInfo;
import com.android.launcher3.graphics.DrawableFactory;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
import com.android.systemui.shared.recents.model.IconLoader;
import com.android.systemui.shared.recents.model.TaskKeyLruCache;

2
src/com/android/launcher3/AutoInstallsLayout.java
View File

@@ -39,7 +39,7 @@ import android.util.Patterns;
import com.android.launcher3.LauncherProvider.SqlArguments;
import com.android.launcher3.LauncherSettings.Favorites;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.util.Thunk;
import org.xmlpull.v1.XmlPullParser;

2
src/com/android/launcher3/DeviceProfile.java
View File

@@ -30,7 +30,7 @@ import android.view.WindowManager;
import com.android.launcher3.CellLayout.ContainerType;
import com.android.launcher3.badge.BadgeRenderer;
import com.android.launcher3.graphics.IconNormalizer;
import com.android.launcher3.icons.IconNormalizer;
public class DeviceProfile {

2
src/com/android/launcher3/FastBitmapDrawable.java
View File

@@ -34,7 +34,7 @@ import android.graphics.drawable.Drawable;
import android.util.Property;
import android.util.SparseArray;
import com.android.launcher3.graphics.BitmapInfo;
import com.android.launcher3.icons.BitmapInfo;
public class FastBitmapDrawable extends Drawable {

4
src/com/android/launcher3/InstallShortcutReceiver.java
View File

@@ -40,8 +40,8 @@ import android.util.Pair;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.graphics.BitmapInfo;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.BitmapInfo;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.shortcuts.DeepShortcutManager;
import com.android.launcher3.shortcuts.ShortcutInfoCompat;
import com.android.launcher3.shortcuts.ShortcutKey;

2
src/com/android/launcher3/ItemInfoWithIcon.java
View File

@@ -16,7 +16,7 @@
package com.android.launcher3;
import static com.android.launcher3.graphics.BitmapInfo.LOW_RES_ICON;
import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON;
import android.graphics.Bitmap;

2
src/com/android/launcher3/LauncherModel.java
View File

@@ -38,7 +38,7 @@ import android.util.Pair;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.PackageInstallerCompat.PackageInstallInfo;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.icons.IconCache;
import com.android.launcher3.model.AddWorkspaceItemsTask;
import com.android.launcher3.model.BaseModelUpdateTask;

4
src/com/android/launcher3/WidgetPreviewLoader.java
View File

@@ -31,8 +31,8 @@ import android.util.LongSparseArray;
import com.android.launcher3.compat.AppWidgetManagerCompat;
import com.android.launcher3.compat.ShortcutConfigActivityInfo;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.graphics.ShadowGenerator;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.icons.ShadowGenerator;
import com.android.launcher3.icons.IconCache;
import com.android.launcher3.model.WidgetItem;
import com.android.launcher3.util.ComponentKey;

2
src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
View File

@@ -19,7 +19,7 @@ import static android.view.View.MeasureSpec.EXACTLY;
import static android.view.View.MeasureSpec.getSize;
import static android.view.View.MeasureSpec.makeMeasureSpec;
import static com.android.launcher3.graphics.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
import android.content.Context;
import android.graphics.Rect;

2
src/com/android/launcher3/badge/BadgeRenderer.java
View File

@@ -27,7 +27,7 @@ import android.graphics.Point;
import android.graphics.Rect;
import android.util.Log;
import com.android.launcher3.graphics.ShadowGenerator;
import com.android.launcher3.icons.ShadowGenerator;
/**
* Contains parameters necessary to draw a badge for an icon (e.g. the size of the badge).

2
src/com/android/launcher3/compat/LauncherAppsCompatVO.java
View File

@@ -33,7 +33,7 @@ import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.ShortcutInfo;
import com.android.launcher3.compat.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVO;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.shortcuts.ShortcutInfoCompat;
import com.android.launcher3.util.LooperExecutor;
import com.android.launcher3.util.PackageUserKey;

2
src/com/android/launcher3/dragndrop/DragView.java
View File

@@ -56,7 +56,7 @@ import com.android.launcher3.FirstFrameAnimatorHelper;
import com.android.launcher3.anim.Interpolators;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.ShortcutConfigActivityInfo;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.shortcuts.DeepShortcutManager;
import com.android.launcher3.shortcuts.ShortcutInfoCompat;
import com.android.launcher3.shortcuts.ShortcutKey;

3
src/com/android/launcher3/graphics/DrawableFactory.java
View File

@@ -16,8 +16,6 @@
package com.android.launcher3.graphics;
import static com.android.launcher3.graphics.BitmapInfo.LOW_RES_ICON;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.res.Resources;
@@ -37,6 +35,7 @@ import com.android.launcher3.FastBitmapDrawable;
import com.android.launcher3.ItemInfoWithIcon;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.icons.BitmapInfo;
import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.launcher3.util.ResourceBasedOverride;

1
src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
View File

@@ -24,6 +24,7 @@ import android.graphics.Rect;
import com.android.launcher3.FastBitmapDrawable;
import com.android.launcher3.ItemInfoWithIcon;
import com.android.launcher3.R;
import com.android.launcher3.icons.BitmapInfo;
import com.android.launcher3.util.Themes;
/**

4
src/com/android/launcher3/icons/BaseIconCache.java
View File

@@ -15,7 +15,7 @@
*/
package com.android.launcher3.icons;
import static com.android.launcher3.graphics.BitmapInfo.LOW_RES_ICON;
import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON;
import android.content.ComponentName;
import android.content.ContentValues;
@@ -48,9 +48,7 @@ import com.android.launcher3.MainThreadExecutor;
import com.android.launcher3.Utilities;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.graphics.BitmapInfo;
import com.android.launcher3.graphics.BitmapRenderer;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.model.PackageItemInfo;
import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.InstantAppResolver;

2
src/com/android/launcher3/graphics/BitmapInfo.java → src/com/android/launcher3/icons/BitmapInfo.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.launcher3.graphics;
package com.android.launcher3.icons;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;

3
src/com/android/launcher3/icons/CachingLogic.java
View File

@@ -20,9 +20,6 @@ import android.content.Context;
import android.content.pm.LauncherActivityInfo;
import android.os.UserHandle;
import com.android.launcher3.graphics.BitmapInfo;
import com.android.launcher3.graphics.LauncherIcons;
public interface CachingLogic<T> {
ComponentName getComponent(T object);

2
src/com/android/launcher3/graphics/ColorExtractor.java → src/com/android/launcher3/icons/ColorExtractor.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.launcher3.graphics;
package com.android.launcher3.icons;
import android.graphics.Bitmap;
import android.graphics.Color;

2
src/com/android/launcher3/graphics/FixedScaleDrawable.java → src/com/android/launcher3/icons/FixedScaleDrawable.java
View File

@@ -1,4 +1,4 @@
package com.android.launcher3.graphics;
package com.android.launcher3.icons;
import android.annotation.TargetApi;
import android.content.res.Resources;

2
src/com/android/launcher3/graphics/IconNormalizer.java → src/com/android/launcher3/icons/IconNormalizer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.launcher3.graphics;
package com.android.launcher3.icons;
import android.content.Context;
import android.graphics.Bitmap;

6
src/com/android/launcher3/graphics/LauncherIcons.java → src/com/android/launcher3/icons/LauncherIcons.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package com.android.launcher3.graphics;
package com.android.launcher3.icons;
import static android.graphics.Paint.DITHER_FLAG;
import static android.graphics.Paint.FILTER_BITMAP_FLAG;
import static com.android.launcher3.graphics.ShadowGenerator.BLUR_FACTOR;
import static com.android.launcher3.icons.ShadowGenerator.BLUR_FACTOR;
import android.content.ComponentName;
import android.content.Context;
@@ -44,7 +44,7 @@ import android.os.UserHandle;
import com.android.launcher3.AppInfo;
import com.android.launcher3.FastBitmapDrawable;
import com.android.launcher3.icons.IconCache;
import com.android.launcher3.graphics.BitmapRenderer;
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.ItemInfoWithIcon;
import com.android.launcher3.LauncherAppState;

2
src/com/android/launcher3/graphics/ShadowGenerator.java → src/com/android/launcher3/icons/ShadowGenerator.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.launcher3.graphics;
package com.android.launcher3.icons;
import android.content.Context;
import android.graphics.Bitmap;

4
src/com/android/launcher3/model/LoaderCursor.java
View File

@@ -43,8 +43,8 @@ import com.android.launcher3.Workspace;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.graphics.BitmapInfo;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.BitmapInfo;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.logging.FileLog;
import com.android.launcher3.util.ContentWriter;
import com.android.launcher3.util.GridOccupancy;

2
src/com/android/launcher3/model/LoaderTask.java
View File

@@ -61,7 +61,7 @@ import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.folder.Folder;
import com.android.launcher3.folder.FolderIconPreviewVerifier;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.logging.FileLog;
import com.android.launcher3.provider.ImportDataTask;
import com.android.launcher3.shortcuts.DeepShortcutManager;

4
src/com/android/launcher3/model/PackageUpdatedTask.java
View File

@@ -38,8 +38,8 @@ import com.android.launcher3.Utilities;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.graphics.BitmapInfo;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.BitmapInfo;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.logging.FileLog;
import com.android.launcher3.shortcuts.DeepShortcutManager;
import com.android.launcher3.shortcuts.ShortcutInfoCompat;

2
src/com/android/launcher3/model/ShortcutsChangedTask.java
View File

@@ -23,7 +23,7 @@ import com.android.launcher3.ItemInfo;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherSettings;
import com.android.launcher3.ShortcutInfo;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.shortcuts.DeepShortcutManager;
import com.android.launcher3.shortcuts.ShortcutInfoCompat;
import com.android.launcher3.shortcuts.ShortcutKey;

2
src/com/android/launcher3/model/UserLockStateChangedTask.java
View File

@@ -26,7 +26,7 @@ import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherSettings;
import com.android.launcher3.ShortcutInfo;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.shortcuts.DeepShortcutManager;
import com.android.launcher3.shortcuts.ShortcutInfoCompat;
import com.android.launcher3.shortcuts.ShortcutKey;

2
src/com/android/launcher3/popup/PopupPopulator.java
View File

@@ -24,7 +24,7 @@ import android.service.notification.StatusBarNotification;
import com.android.launcher3.ItemInfo;
import com.android.launcher3.Launcher;
import com.android.launcher3.ShortcutInfo;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.notification.NotificationInfo;
import com.android.launcher3.notification.NotificationKeyData;
import com.android.launcher3.shortcuts.DeepShortcutManager;

2
src/com/android/launcher3/widget/PendingItemDragHelper.java
View File

@@ -34,7 +34,7 @@ import com.android.launcher3.R;
import com.android.launcher3.dragndrop.DragOptions;
import com.android.launcher3.dragndrop.LivePreviewWidgetCell;
import com.android.launcher3.graphics.DragPreviewProvider;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.icons.LauncherIcons;
/**
* Extension of {@link DragPreviewProvider} with logic specific to pending widgets/shortcuts

2
src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java
View File

@@ -45,7 +45,7 @@ import android.util.Log;
import android.util.Pair;
import com.android.launcher3.Utilities;
import com.android.launcher3.graphics.ColorExtractor;
import com.android.launcher3.icons.ColorExtractor;
import java.io.IOException;
import java.util.ArrayList;

2
tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java
View File

@@ -32,7 +32,7 @@ import com.android.launcher3.LauncherModel;
import com.android.launcher3.LauncherModel.Callbacks;
import com.android.launcher3.LauncherModel.ModelUpdateTask;
import com.android.launcher3.LauncherProvider;
import com.android.launcher3.graphics.BitmapInfo;
import com.android.launcher3.icons.BitmapInfo;
import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.Provider;
import com.android.launcher3.util.TestLauncherProvider;

2
tests/src/com/android/launcher3/model/LoaderCursorTest.java
View File

@@ -17,7 +17,7 @@ import com.android.launcher3.LauncherAppState;
import com.android.launcher3.ShortcutInfo;
import com.android.launcher3.Utilities;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.graphics.BitmapInfo;
import com.android.launcher3.icons.BitmapInfo;
import org.junit.Before;
import org.junit.Test;