diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-06-27 15:47:49 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-07-02 11:16:04 -0700 |
commit | 7f920b8d5ed41375641cc991a037499443dc9098 (patch) | |
tree | 7e61f78359542d81d0f85ab1bffe4d7bf611b84a /quickstep | |
parent | 132bfb8a1f3d7697b98b9c1813f8fe2ddbfb5b36 (diff) | |
download | android_packages_apps_Trebuchet-7f920b8d5ed41375641cc991a037499443dc9098.tar.gz android_packages_apps_Trebuchet-7f920b8d5ed41375641cc991a037499443dc9098.tar.bz2 android_packages_apps_Trebuchet-7f920b8d5ed41375641cc991a037499443dc9098.zip |
Cleaning up build rules to simplify customizing derivative projects
> Using {packageName} instead of hardcoding com.android.launcher3 in AndroidManifest.xml
for strings which are dependent on packageName
> Adding proguard rule to prevent obfuscating any overridable class
> Making it easier to extend SettingsActivity by overriding the fragment class
Change-Id: I5668c3f33b4cf20ad01d7f54b3d79cc0d268d391
Diffstat (limited to 'quickstep')
-rw-r--r-- | quickstep/AndroidManifest.xml | 6 | ||||
-rw-r--r-- | quickstep/src/com/android/quickstep/OverviewCallbacks.java | 6 | ||||
-rw-r--r-- | quickstep/src/com/android/quickstep/TaskOverlayFactory.java | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index cb7485587..74e0b1e77 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -24,6 +24,7 @@ <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="28"/> <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" /> + <application android:backupAgent="com.android.launcher3.LauncherBackupAgent" android:fullBackupOnly="true" @@ -59,10 +60,10 @@ android:resumeWhilePausing="true" android:taskAffinity="" /> - <!-- Content provider to settings search --> + <!-- Content provider to settings search. The autority should be same as the packageName --> <provider android:name="com.android.quickstep.LauncherSearchIndexablesProvider" - android:authorities="com.android.launcher3" + android:authorities="${packageName}" android:grantUriPermissions="true" android:multiprocess="true" android:permission="android.permission.READ_SEARCH_INDEXABLES" @@ -72,7 +73,6 @@ </intent-filter> </provider> - <service android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService" tools:node="remove" /> diff --git a/quickstep/src/com/android/quickstep/OverviewCallbacks.java b/quickstep/src/com/android/quickstep/OverviewCallbacks.java index ac4a40b98..ef9c5c0d9 100644 --- a/quickstep/src/com/android/quickstep/OverviewCallbacks.java +++ b/quickstep/src/com/android/quickstep/OverviewCallbacks.java @@ -18,20 +18,20 @@ package com.android.quickstep; import android.content.Context; import com.android.launcher3.R; -import com.android.launcher3.Utilities; import com.android.launcher3.util.Preconditions; +import com.android.launcher3.util.ResourceBasedOverride; /** * Callbacks related to overview/quicksteps. */ -public class OverviewCallbacks { +public class OverviewCallbacks implements ResourceBasedOverride { private static OverviewCallbacks sInstance; public static OverviewCallbacks get(Context context) { Preconditions.assertUIThread(); if (sInstance == null) { - sInstance = Utilities.getOverrideObject(OverviewCallbacks.class, + sInstance = Overrides.getObject(OverviewCallbacks.class, context.getApplicationContext(), R.string.overview_callbacks_class); } return sInstance; diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java index 9d3ac6af6..c272b1a7e 100644 --- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java @@ -22,22 +22,22 @@ import android.support.annotation.AnyThread; import android.view.View; import com.android.launcher3.R; -import com.android.launcher3.Utilities; import com.android.launcher3.util.Preconditions; +import com.android.launcher3.util.ResourceBasedOverride; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.ThumbnailData; /** * Factory class to create and add an overlays on the TaskView */ -public class TaskOverlayFactory { +public class TaskOverlayFactory implements ResourceBasedOverride { private static TaskOverlayFactory sInstance; public static TaskOverlayFactory get(Context context) { Preconditions.assertUIThread(); if (sInstance == null) { - sInstance = Utilities.getOverrideObject(TaskOverlayFactory.class, + sInstance = Overrides.getObject(TaskOverlayFactory.class, context.getApplicationContext(), R.string.task_overlay_factory_class); } return sInstance; |