Merge "Moving various nav-bar configs out of feature flags" into main (8ecbaa42) · Commits · e / os / android_packages_apps_Trebuchet

OWNERS

+3 −0

Original line number	Diff line number	Diff line
		@@ -45,3 +45,6 @@ zakcohen@google.com

		per-file FeatureFlags.java, globs = set noparent
		per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com

		per-file DeviceConfigWrapper.java, globs = set noparent
		per-file DeviceConfigWrapper.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ import java.lang.ref.WeakReference;
		import java.util.ArrayList;
		import java.util.LinkedHashMap;
		import java.util.List;
		import java.util.Map.Entry;

		/**
		* Manages the opening and closing app transitions from Launcher

quickstep/src/com/android/launcher3/uioverrides/flags/DevOptionsUiHelper.kt

0 → 100644

+148 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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 com.android.launcher3.uioverrides.flags

		import android.os.Handler
		import android.provider.DeviceConfig
		import android.text.Html
		import android.view.inputmethod.EditorInfo
		import androidx.preference.Preference
		import androidx.preference.PreferenceGroup
		import androidx.preference.PreferenceViewHolder
		import androidx.preference.SwitchPreference
		import com.android.launcher3.ExtendedEditText
		import com.android.launcher3.R
		import com.android.quickstep.util.DeviceConfigHelper
		import com.android.quickstep.util.DeviceConfigHelper.Companion.NAMESPACE_LAUNCHER
		import com.android.quickstep.util.DeviceConfigHelper.DebugInfo

		/** Helper class to generate UI for Device Config */
		class DevOptionsUiHelper {

		/** Inflates preferences for all server flags in the provider PreferenceGroup */
		fun inflateServerFlags(parent: PreferenceGroup) {
		val prefs = DeviceConfigHelper.prefs
		// Sort the keys in the order of modified first followed by natural order
		val allProps =
		DeviceConfigHelper.allProps.values
		.toList()
		.sortedWith(
		Comparator.comparingInt { prop: DebugInfo<*> ->
		if (prefs.contains(prop.key)) 0 else 1
		}
		.thenComparing { prop: DebugInfo<*> -> prop.key }
		)

		// First add boolean flags
		allProps.forEach {
		if (it.isInt) return@forEach
		val info = it as DebugInfo<Boolean>

		val preference =
		object : SwitchPreference(parent.context) {
		override fun onBindViewHolder(holder: PreferenceViewHolder) {
		super.onBindViewHolder(holder)
		holder.itemView.setOnLongClickListener {
		prefs.edit().remove(key).apply()
		setChecked(info.getBoolValue())
		summary = info.getSummary()
		true
		}
		}
		}
		preference.key = info.key
		preference.isPersistent = false
		preference.title = info.key
		preference.summary = info.getSummary()
		preference.setChecked(prefs.getBoolean(info.key, info.getBoolValue()))
		preference.setOnPreferenceChangeListener { _, newVal ->
		DeviceConfigHelper.prefs.edit().putBoolean(info.key, newVal as Boolean).apply()
		preference.summary = info.getSummary()
		true
		}
		parent.addPreference(preference)
		}

		// Apply Int flags
		allProps.forEach {
		if (!it.isInt) return@forEach
		val info = it as DebugInfo<Int>

		val preference =
		object : Preference(parent.context) {
		override fun onBindViewHolder(holder: PreferenceViewHolder) {
		super.onBindViewHolder(holder)
		val textView = holder.findViewById(R.id.pref_edit_text) as ExtendedEditText
		textView.setText(info.getIntValueAsString())
		textView.setOnEditorActionListener { _, actionId, _ ->
		if (actionId == EditorInfo.IME_ACTION_DONE) {
		DeviceConfigHelper.prefs
		.edit()
		.putInt(key, textView.text.toString().toInt())
		.apply()
		Handler().post { summary = info.getSummary() }
		true
		}
		false
		}
		textView.setOnBackKeyListener {
		textView.setText(info.getIntValueAsString())
		true
		}

		holder.itemView.setOnLongClickListener {
		prefs.edit().remove(key).apply()
		textView.setText(info.getIntValueAsString())
		summary = info.getSummary()
		true
		}
		}
		}
		preference.key = info.key
		preference.isPersistent = false
		preference.title = info.key
		preference.summary = info.getSummary()
		preference.widgetLayoutResource = R.layout.develop_options_edit_text
		parent.addPreference(preference)
		}
		}

		/**
		* Returns the summary to show the description and whether the flag overrides the default value.
		*/
		private fun DebugInfo<*>.getSummary() =
		Html.fromHtml(
		(if (DeviceConfigHelper.prefs.contains(this.key))
		"<font color='red'><b>[OVERRIDDEN]</b></font><br>"
		else "") + this.desc
		)

		private fun DebugInfo<Boolean>.getBoolValue() =
		DeviceConfigHelper.prefs.getBoolean(
		this.key,
		DeviceConfig.getBoolean(NAMESPACE_LAUNCHER, this.key, this.valueInCode)
		)

		private fun DebugInfo<Int>.getIntValueAsString() =
		DeviceConfigHelper.prefs
		.getInt(this.key, DeviceConfig.getInt(NAMESPACE_LAUNCHER, this.key, this.valueInCode))
		.toString()

		companion object {
		const val TAG = "DeviceConfigUIHelper"
		}
		}

quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsUI.java

+14 −142

Original line number	Diff line number	Diff line
		@@ -20,19 +20,8 @@ import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
		import static android.view.View.GONE;
		import static android.view.View.VISIBLE;

		import static com.android.launcher3.LauncherPrefs.ALL_APPS_OVERVIEW_THRESHOLD;
		import static com.android.launcher3.LauncherPrefs.PRIVATE_SPACE_APPS;
		import static com.android.launcher3.config.FeatureFlags.LPNH_EXTRA_TOUCH_WIDTH_DP;
		import static com.android.launcher3.config.FeatureFlags.LPNH_HAPTIC_HINT_DELAY;
		import static com.android.launcher3.config.FeatureFlags.LPNH_HAPTIC_HINT_END_SCALE_PERCENT;
		import static com.android.launcher3.config.FeatureFlags.LPNH_HAPTIC_HINT_ITERATIONS;
		import static com.android.launcher3.config.FeatureFlags.LPNH_HAPTIC_HINT_SCALE_EXPONENT;
		import static com.android.launcher3.config.FeatureFlags.LPNH_HAPTIC_HINT_START_SCALE_PERCENT;
		import static com.android.launcher3.config.FeatureFlags.LPNH_SLOP_PERCENTAGE;
		import static com.android.launcher3.config.FeatureFlags.LPNH_TIMEOUT_MS;
		import static com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_HIGHLIGHT_KEY;
		import static com.android.launcher3.uioverrides.plugins.PluginManagerWrapper.PLUGIN_CHANGED;
		import static com.android.launcher3.uioverrides.plugins.PluginManagerWrapper.pluginEnabledKey;
		import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT;
		import static com.android.launcher3.util.OnboardingPrefs.HOME_BOUNCE_COUNT;
		import static com.android.launcher3.util.OnboardingPrefs.HOME_BOUNCE_SEEN;
		@@ -51,7 +40,6 @@ import android.provider.Settings;
		import android.text.Editable;
		import android.text.TextWatcher;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.util.Pair;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -61,21 +49,18 @@ import android.widget.Toast;

		import androidx.preference.Preference;
		import androidx.preference.PreferenceCategory;
		import androidx.preference.PreferenceDataStore;
		import androidx.preference.PreferenceFragmentCompat;
		import androidx.preference.PreferenceGroup;
		import androidx.preference.PreferenceScreen;
		import androidx.preference.PreferenceViewHolder;
		import androidx.preference.SeekBarPreference;
		import androidx.preference.SwitchPreference;

		import com.android.launcher3.ConstantItem;
		import com.android.launcher3.Flags;
		import com.android.launcher3.LauncherPrefs;
		import com.android.launcher3.R;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.secondarydisplay.SecondaryDisplayLauncher;
		import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
		import com.android.systemui.shared.plugins.PluginEnabler;

		import java.util.ArrayList;
		import java.util.List;
		@@ -96,8 +81,6 @@ public class DeveloperOptionsUI {
		private final PreferenceFragmentCompat mFragment;
		private final PreferenceScreen mPreferenceScreen;

		private final FlagTogglerPrefUi mFlagTogglerPrefUi;

		private PreferenceCategory mPluginsCategory;

		public DeveloperOptionsUI(PreferenceFragmentCompat fragment, PreferenceCategory flags) {
		@@ -112,20 +95,14 @@ public class DeveloperOptionsUI {
		parent.addView(topBar, parent.indexOfChild(listView));
		initSearch(topBar.findViewById(R.id.filter_box));

		mFlagTogglerPrefUi = new FlagTogglerPrefUi(mFragment.requireActivity(),
		topBar.findViewById(R.id.flag_apply_btn));
		mFlagTogglerPrefUi.applyTo(flags);
		new FlagTogglerPrefUi(mFragment.requireActivity(), topBar.findViewById(R.id.flag_apply_btn))
		.applyTo(flags);
		DevOptionsUiHelper uiHelper = new DevOptionsUiHelper();
		uiHelper.inflateServerFlags(newCategory("Server flags"));

		loadPluginPrefs();
		maybeAddSandboxCategory();
		addOnboardingPrefsCatergory();
		if (FeatureFlags.ENABLE_ALL_APPS_FROM_OVERVIEW.get()) {
		addAllAppsFromOverviewCatergory();
		}
		addCustomLpnhCategory();
		if (Flags.enablePrivateSpace()) {
		addCustomPrivateAppsCategory();
		}
		}

		private void filterPreferences(String query, PreferenceGroup pg) {
		@@ -228,7 +205,7 @@ public class DeveloperOptionsUI {
		}
		}

		PreferenceDataStore enabler = manager.getPluginEnabler();
		PluginEnabler enabler = manager.getPluginEnabler();
		plugins.forEach((key, si) -> {
		String packageName = key.first;
		List<ComponentName> componentNames = si.stream()
		@@ -347,111 +324,10 @@ public class DeveloperOptionsUI {
		return onboardingPref;
		}

		private void addAllAppsFromOverviewCatergory() {
		PreferenceCategory category = newCategory("All Apps from Overview Config");
		category.addPreference(createSeekBarPreference("Threshold to open All Apps from Overview",
		105, 500, 100, ALL_APPS_OVERVIEW_THRESHOLD));
		}

		private void addCustomLpnhCategory() {
		PreferenceCategory category = newCategory("Long Press Nav Handle Config");
		if (FeatureFlags.CUSTOM_LPNH_THRESHOLDS.get()) {
		category.addPreference(createSeekBarPreference(
		"Slop multiplier (applied to edge slop, "
		+ "which is generally already 50% higher than touch slop)",
		25, 200, 100, LPNH_SLOP_PERCENTAGE));
		category.addPreference(createSeekBarPreference(
		"Extra width DP (how far outside the sides of the nav bar to trigger)",
		// Stashed taskbar is currently 220dp; -86 (x2) would result in 48dp touch area.
		-86, 100, 1, LPNH_EXTRA_TOUCH_WIDTH_DP));
		category.addPreference(createSeekBarPreference("LPNH timeout",
		100, 500, 1, LPNH_TIMEOUT_MS));
		}
		if (FeatureFlags.ENABLE_SEARCH_HAPTIC_HINT.get()) {
		category.addPreference(
		createSeekBarPreference("Haptic hint start scale",
		0, 100, 100, LPNH_HAPTIC_HINT_START_SCALE_PERCENT));
		category.addPreference(createSeekBarPreference("Haptic hint end scale",
		0, 100, 100, LPNH_HAPTIC_HINT_END_SCALE_PERCENT));
		category.addPreference(
		createSeekBarPreference("Haptic hint scale exponent",
		1, 5, 1, LPNH_HAPTIC_HINT_SCALE_EXPONENT));
		category.addPreference(
		createSeekBarPreference("Haptic hint iterations (12 ms each)",
		0, 200, 1, LPNH_HAPTIC_HINT_ITERATIONS));
		category.addPreference(createSeekBarPreference("Haptic hint delay (ms)",
		0, 400, 1, LPNH_HAPTIC_HINT_DELAY));
		}
		}

		private void addCustomPrivateAppsCategory() {
		PreferenceCategory category = newCategory("Apps in Private Space Config");
		category.addPreference(createSeekBarPreference(
		"Number of Apps to put in private region", 0, 100, 1, PRIVATE_SPACE_APPS));
		}

		private SeekBarPreference createSeekBarPreference(String title, int min,
		int max, int scale, FeatureFlags.IntFlag flag) {
		if (!(flag instanceof IntDebugFlag)) {
		Log.e(TAG, "Cannot create seekbar preference with IntFlag. Use a launcher preference "
		+ "flag or pref-backed IntDebugFlag instead");
		return null;
		}
		IntDebugFlag debugflag = (IntDebugFlag) flag;
		if (debugflag.launcherPrefFlag == null) {
		Log.e(TAG, "Cannot create seekbar preference with IntDebugFlag. Use a launcher "
		+ "preference flag or pref-backed IntDebugFlag instead");
		return null;
		}
		SeekBarPreference seekBarPref = createSeekBarPreference(title, min, max, scale,
		debugflag.launcherPrefFlag);
		int value = flag.get();
		seekBarPref.setValue(value);
		// For some reason the initial value is not triggering the summary update, so call manually.
		seekBarPref.setSummary(String.valueOf(scale == 1 ? value
		: value / (float) scale));
		return seekBarPref;
		}

		/**
		* Create a preference with text and a seek bar. Should be added to a PreferenceCategory.
		*
		* @param title text to show for this seek bar
		* @param min min value for the seek bar
		* @param max max value for the seek bar
		* @param scale how much to divide the value to convert int to float
		* @param launcherPref used to store the current value
		*/
		private SeekBarPreference createSeekBarPreference(String title, int min, int max, int scale,
		ConstantItem<Integer> launcherPref) {
		SeekBarPreference seekBarPref = new SeekBarPreference(getContext());
		seekBarPref.setTitle(title);
		seekBarPref.setSingleLineTitle(false);

		seekBarPref.setMax(max);
		seekBarPref.setMin(min);
		seekBarPref.setUpdatesContinuously(true);
		seekBarPref.setIconSpaceReserved(false);
		// Don't directly save to shared prefs, use LauncherPrefs instead.
		seekBarPref.setPersistent(false);
		seekBarPref.setOnPreferenceChangeListener((preference, newValue) -> {
		LauncherPrefs.get(getContext()).put(launcherPref, newValue);
		preference.setSummary(String.valueOf(scale == 1 ? newValue
		: (int) newValue / (float) scale));
		mFlagTogglerPrefUi.updateMenu();
		return true;
		});
		int value = LauncherPrefs.get(getContext()).get(launcherPref);
		seekBarPref.setValue(value);
		// For some reason the initial value is not triggering the summary update, so call manually.
		seekBarPref.setSummary(String.valueOf(scale == 1 ? value
		: value / (float) scale));
		return seekBarPref;
		}

		private String toName(String action) {
		String str = action.replace("com.android.systemui.action.PLUGIN_", "")
		.replace("com.android.launcher3.action.PLUGIN_", "");

		StringBuilder b = new StringBuilder();
		for (String s : str.split("_")) {
		if (b.length() != 0) {
		@@ -466,11 +342,11 @@ public class DeveloperOptionsUI {
		private static class PluginPreference extends SwitchPreference {
		private final String mPackageName;
		private final ResolveInfo mSettingsInfo;
		private final PreferenceDataStore mPluginEnabler;
		private final PluginEnabler mPluginEnabler;
		private final List<ComponentName> mComponentNames;

		PluginPreference(Context prefContext, ResolveInfo pluginInfo,
		PreferenceDataStore pluginEnabler, List<ComponentName> componentNames) {
		PluginEnabler pluginEnabler, List<ComponentName> componentNames) {
		super(prefContext);
		PackageManager pm = prefContext.getPackageManager();
		mPackageName = pluginInfo.serviceInfo.applicationInfo.packageName;
		@@ -495,14 +371,9 @@ public class DeveloperOptionsUI {
		setWidgetLayoutResource(R.layout.switch_preference_with_settings);
		}

		private boolean isEnabled(ComponentName cn) {
		return mPluginEnabler.getBoolean(pluginEnabledKey(cn), true);

		}

		private boolean isPluginEnabled() {
		for (ComponentName componentName : mComponentNames) {
		if (!isEnabled(componentName)) {
		if (!mPluginEnabler.isEnabled(componentName)) {
		return false;
		}
		}
		@@ -513,8 +384,9 @@ public class DeveloperOptionsUI {
		protected boolean persistBoolean(boolean isEnabled) {
		boolean shouldSendBroadcast = false;
		for (ComponentName componentName : mComponentNames) {
		if (isEnabled(componentName) != isEnabled) {
		mPluginEnabler.putBoolean(pluginEnabledKey(componentName), isEnabled);
		if (mPluginEnabler.isEnabled(componentName) != isEnabled) {
		mPluginEnabler.setDisabled(componentName,
		isEnabled ? PluginEnabler.ENABLED : PluginEnabler.DISABLED_MANUALLY);
		shouldSendBroadcast = true;
		}
		}

quickstep/src/com/android/launcher3/uioverrides/flags/FlagTogglerPrefUi.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import androidx.preference.PreferenceGroup;
		import androidx.preference.PreferenceViewHolder;
		import androidx.preference.SwitchPreference;

		import com.android.launcher3.LauncherPrefs;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter;

		@@ -162,22 +161,12 @@ public final class FlagTogglerPrefUi implements ActivityLifecycleCallbacksAdapte
		return mDataStore.getBoolean(flag.key, defaultValue);
		}

		private int getIntFlagStateFromSharedPrefs(IntDebugFlag flag) {
		LauncherPrefs prefs = LauncherPrefs.get(mContext);
		return flag.launcherPrefFlag == null ? flag.get() : prefs.get(flag.launcherPrefFlag);
		}

		private boolean anyChanged() {
		for (DebugFlag flag : FlagsFactory.getDebugFlags()) {
		if (getFlagStateFromSharedPrefs(flag) != flag.get()) {
		return true;
		}
		}
		for (IntDebugFlag flag : FlagsFactory.getIntDebugFlags()) {
		if (getIntFlagStateFromSharedPrefs(flag) != flag.get()) {
		return true;
		}
		}
		return false;
		}
		}