Merge "Freezing legacy feature flags" into main
This commit is contained in:
commit
63bf93cf65
12 files changed
+40
-597
No files matched your search
@@ -95,7 +95,6 @@ import com.android.launcher3.taskbar.TaskbarManager;
|
||||
import com.android.launcher3.testing.TestLogging;
|
||||
import com.android.launcher3.testing.shared.ResourceUtils;
|
||||
import com.android.launcher3.testing.shared.TestProtocol;
|
||||
import com.android.launcher3.uioverrides.flags.FlagsFactory;
|
||||
import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
|
||||
import com.android.launcher3.util.DisplayController;
|
||||
import com.android.launcher3.util.LockedUserState;
|
||||
@@ -1421,7 +1420,6 @@ public class TouchInteractionService extends Service {
|
||||
@Override
|
||||
protected void dump(FileDescriptor fd, PrintWriter pw, String[] rawArgs) {
|
||||
// Dump everything
|
||||
FlagsFactory.dump(pw);
|
||||
if (LockedUserState.get(this).isUserUnlocked()) {
|
||||
PluginManagerWrapper.INSTANCE.get(getBaseContext()).dump(pw);
|
||||
}
|
||||
|
||||
@@ -19,13 +19,12 @@ package com.android.quickstep.util
|
||||
import android.app.ActivityThread
|
||||
import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
import android.content.SharedPreferences.*
|
||||
import android.content.SharedPreferences.OnSharedPreferenceChangeListener
|
||||
import android.provider.DeviceConfig
|
||||
import android.provider.DeviceConfig.OnPropertiesChangedListener
|
||||
import android.provider.DeviceConfig.Properties
|
||||
import androidx.annotation.WorkerThread
|
||||
import com.android.launcher3.BuildConfig
|
||||
import com.android.launcher3.uioverrides.flags.FlagsFactory
|
||||
import com.android.launcher3.util.Executors
|
||||
|
||||
/** Utility class to manage a set of device configurations */
|
||||
@@ -79,10 +78,7 @@ class DeviceConfigHelper<ConfigType>(private val factory: (PropReader) -> Config
|
||||
|
||||
private fun recreateConfig() {
|
||||
val myProps =
|
||||
DeviceConfig.getProperties(
|
||||
FlagsFactory.NAMESPACE_LAUNCHER,
|
||||
*allKeys.toTypedArray<String>()
|
||||
)
|
||||
DeviceConfig.getProperties(NAMESPACE_LAUNCHER, *allKeys.toTypedArray<String>())
|
||||
config =
|
||||
factory(
|
||||
PropReader(
|
||||
|
||||
Reference in new issue
Block a user