fix: Disable material expressive folder expansion animations
This commit is contained in:
@@ -12,33 +12,20 @@
|
||||
* 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.
|
||||
*
|
||||
* Modifications copyright 2021, Lawnchair
|
||||
*/
|
||||
package com.android.launcher3.util;
|
||||
|
||||
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.ContextWrapper;
|
||||
import android.os.Looper;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.UiThread;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.launcher3.util.ResourceBasedOverride.Overrides;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* Utility class for defining singletons which are initiated on main thread.
|
||||
* <p>
|
||||
* Lawnchair: This class has moved to Launcher3 Go variant.
|
||||
*/
|
||||
public class MainThreadInitializedObject<T extends SafeCloseable> {
|
||||
|
||||
@@ -51,7 +38,7 @@ public class MainThreadInitializedObject<T extends SafeCloseable> {
|
||||
|
||||
public T get(Context context) {
|
||||
Context app = context.getApplicationContext();
|
||||
if (app instanceof SandboxApplication sc) {
|
||||
if (app instanceof ObjectSandbox sc) {
|
||||
return sc.getObject(this);
|
||||
}
|
||||
|
||||
@@ -69,127 +56,18 @@ public class MainThreadInitializedObject<T extends SafeCloseable> {
|
||||
return mValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes the callback is the value is already created
|
||||
*
|
||||
* @return true if the callback was executed, false otherwise
|
||||
*/
|
||||
public boolean executeIfCreated(Consumer<T> callback) {
|
||||
T v = mValue;
|
||||
if (v != null) {
|
||||
callback.accept(v);
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
public void initializeForTesting(T value) {
|
||||
mValue = value;
|
||||
}
|
||||
|
||||
protected void onPostInit(Context context) {
|
||||
}
|
||||
|
||||
public T getNoCreate() {
|
||||
return mValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes a provider based on resource overrides
|
||||
*/
|
||||
public static <T extends ResourceBasedOverride & SafeCloseable> MainThreadInitializedObject<T> forOverride(
|
||||
Class<T> clazz, int resourceId) {
|
||||
return new MainThreadInitializedObject<>(c -> Overrides.getObject(clazz, c, resourceId));
|
||||
}
|
||||
|
||||
public interface ObjectProvider<T> {
|
||||
|
||||
T get(Context context);
|
||||
}
|
||||
|
||||
public interface SandboxApplication {
|
||||
/** Sandbox for isolating {@link MainThreadInitializedObject} instances from Launcher. */
|
||||
public interface ObjectSandbox {
|
||||
|
||||
/**
|
||||
* Find a cached object from mObjectMap if we have already created one. If not,
|
||||
* generate
|
||||
* Find a cached object from mObjectMap if we have already created one. If not, generate
|
||||
* an object using the provider.
|
||||
*/
|
||||
<T extends SafeCloseable> T getObject(MainThreadInitializedObject<T> object);
|
||||
|
||||
@UiThread
|
||||
default <T extends SafeCloseable> T createObject(MainThreadInitializedObject<T> object) {
|
||||
return object.mProvider.get((Context) this);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Abstract Context which allows custom implementations for
|
||||
* {@link MainThreadInitializedObject} providers
|
||||
*/
|
||||
public static class SandboxContext extends ContextWrapper implements SandboxApplication {
|
||||
|
||||
private static final String TAG = "SandboxContext";
|
||||
|
||||
public final Map<MainThreadInitializedObject, Object> mObjectMap = new HashMap<>();
|
||||
public final ArrayList<SafeCloseable> mOrderedObjects = new ArrayList<>();
|
||||
|
||||
private final Object mDestroyLock = new Object();
|
||||
private boolean mDestroyed = false;
|
||||
|
||||
public SandboxContext(Context base) {
|
||||
super(base);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Context getApplicationContext() {
|
||||
return this;
|
||||
}
|
||||
|
||||
public void onDestroy() {
|
||||
synchronized (mDestroyLock) {
|
||||
// Destroy in reverse order
|
||||
for (int i = mOrderedObjects.size() - 1; i >= 0; i--) {
|
||||
mOrderedObjects.get(i).close();
|
||||
}
|
||||
mDestroyed = true;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends SafeCloseable> T getObject(MainThreadInitializedObject<T> object) {
|
||||
synchronized (mDestroyLock) {
|
||||
if (mDestroyed) {
|
||||
Log.e(TAG, "Static object access with a destroyed context");
|
||||
}
|
||||
T t = (T) mObjectMap.get(object);
|
||||
if (t != null) {
|
||||
return t;
|
||||
}
|
||||
if (Looper.myLooper() == Looper.getMainLooper()) {
|
||||
t = createObject(object);
|
||||
mObjectMap.put(object, t);
|
||||
mOrderedObjects.add(t);
|
||||
return t;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
return MAIN_EXECUTOR.submit(() -> getObject(object)).get();
|
||||
} catch (InterruptedException | ExecutionException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Put a value into mObjectMap, can be used to put mocked
|
||||
* MainThreadInitializedObject
|
||||
* instances into SandboxContext.
|
||||
*/
|
||||
public <T extends SafeCloseable> void putObject(
|
||||
MainThreadInitializedObject<T> object, T value) {
|
||||
mObjectMap.put(object, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user