PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Simplifying settings activity" into main

Browse Source
This commit is contained in:
Sunny Goyal
2023-10-24 20:13:17 +00:00
committed by Android (Google) Code Review
parent c8ac1b41f7 6eb256d794
commit 7955bd97df
11 changed files with 221 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Utilities.java
-6
View File
@@ -58,7 +58,6 @@ import android.os.Handler;
import android.os.Message;
import android.os.Process;
import android.os.TransactionTooLargeException;
import android.provider.Settings;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
@@ -168,11 +167,6 @@ public final class Utilities {
return nightMode == Configuration.UI_MODE_NIGHT_YES;
}
public static boolean isDevelopersOptionsEnabled(Context context) {
return Settings.Global.getInt(context.getApplicationContext().getContentResolver(),
Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
}
private static boolean sIsRunningInTestHarness = ActivityManager.isRunningInTestHarness();
public static boolean isRunningInTestHarness() {
src/com/android/launcher3/config/FeatureFlags.java
-7
View File
@@ -23,13 +23,10 @@ import static com.android.launcher3.config.FeatureFlags.FlagState.TEAMFOOD;
import static com.android.launcher3.uioverrides.flags.FlagsFactory.getDebugFlag;
import static com.android.launcher3.uioverrides.flags.FlagsFactory.getReleaseFlag;
import android.content.Context;
import androidx.annotation.VisibleForTesting;
import com.android.launcher3.BuildConfig;
import com.android.launcher3.Flags;
import com.android.launcher3.Utilities;
import java.util.function.Predicate;
import java.util.function.ToIntFunction;
@@ -48,10 +45,6 @@ public final class FeatureFlags {
private FeatureFlags() { }
public static boolean showFlagTogglerUi(Context context) {
return BuildConfig.IS_DEBUG_DEVICE && Utilities.isDevelopersOptionsEnabled(context);
}
/**
* True when the build has come from Android Studio and is being used for local debugging.
* @deprecated Use {@link BuildConfig#IS_STUDIO_BUILD} directly
src/com/android/launcher3/settings/NotificationDotsPreference.java
+5 -5
View File
@@ -15,8 +15,7 @@
*/
package com.android.launcher3.settings;
import static com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
import static com.android.launcher3.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGS;
import static com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_HIGHLIGHT_KEY;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
@@ -51,6 +50,7 @@ public class NotificationDotsPreference extends Preference
/** Hidden field Settings.Secure.ENABLED_NOTIFICATION_LISTENERS */
private static final String NOTIFICATION_ENABLED_LISTENERS = "enabled_notification_listeners";
private static final String EXTRA_SHOW_FRAGMENT_ARGS = ":settings:show_fragment_args";
private final ContentObserver mListenerListObserver =
new ContentObserver(MAIN_EXECUTOR.getHandler()) {
@@ -88,7 +88,7 @@ public class NotificationDotsPreference extends Preference
// Update intent
Bundle extras = new Bundle();
extras.putString(EXTRA_FRAGMENT_ARG_KEY, "notification_badging");
extras.putString(EXTRA_FRAGMENT_HIGHLIGHT_KEY, "notification_badging");
setIntent(new Intent("android.settings.NOTIFICATION_SETTINGS")
.putExtra(EXTRA_SHOW_FRAGMENT_ARGS, extras));
@@ -169,11 +169,11 @@ public class NotificationDotsPreference extends Preference
public void onClick(DialogInterface dialogInterface, int i) {
ComponentName cn = new ComponentName(getActivity(), NotificationListener.class);
Bundle showFragmentArgs = new Bundle();
showFragmentArgs.putString(EXTRA_FRAGMENT_ARG_KEY, cn.flattenToString());
showFragmentArgs.putString(EXTRA_FRAGMENT_HIGHLIGHT_KEY, cn.flattenToString());
Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra(EXTRA_FRAGMENT_ARG_KEY, cn.flattenToString())
.putExtra(EXTRA_FRAGMENT_HIGHLIGHT_KEY, cn.flattenToString())
.putExtra(EXTRA_SHOW_FRAGMENT_ARGS, showFragmentArgs);
getActivity().startActivity(intent);
}
src/com/android/launcher3/settings/SettingsActivity.java
+104 -101
View File
@@ -16,19 +16,26 @@
package com.android.launcher3.settings;
import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
import static android.provider.Settings.Global.DEVELOPMENT_SETTINGS_ENABLED;
import static com.android.launcher3.config.FeatureFlags.IS_STUDIO_BUILD;
import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
import static androidx.preference.PreferenceFragmentCompat.ARG_PREFERENCE_ROOT;
import static com.android.launcher3.BuildConfig.IS_DEBUG_DEVICE;
import static com.android.launcher3.BuildConfig.IS_STUDIO_BUILD;
import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.text.TextUtils;
import android.view.MenuItem;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.core.view.WindowCompat;
import androidx.fragment.app.DialogFragment;
@@ -36,6 +43,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceFragmentCompat.OnPreferenceStartFragmentCallback;
import androidx.preference.PreferenceFragmentCompat.OnPreferenceStartScreenCallback;
@@ -43,59 +51,51 @@ import androidx.preference.PreferenceGroup.PreferencePositionCallback;
import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
import com.android.launcher3.BuildConfig;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.LauncherFiles;
import com.android.launcher3.LauncherPrefs;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.model.WidgetsModel;
import com.android.launcher3.states.RotationHelper;
import com.android.launcher3.uioverrides.flags.DeveloperOptionsFragment;
import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
import com.android.launcher3.uioverrides.flags.DeveloperOptionsUI;
import com.android.launcher3.util.DisplayController;
import java.util.Collections;
import java.util.List;
import com.android.launcher3.util.Executors;
import com.android.launcher3.util.SettingsCache;
/**
* Settings activity for Launcher. Currently implements the following setting: Allow rotation
*/
public class SettingsActivity extends FragmentActivity
implements OnPreferenceStartFragmentCallback, OnPreferenceStartScreenCallback,
SharedPreferences.OnSharedPreferenceChangeListener{
implements OnPreferenceStartFragmentCallback, OnPreferenceStartScreenCallback {
/** List of fragments that can be hosted by this activity. */
private static final List<String> VALID_PREFERENCE_FRAGMENTS =
!Utilities.IS_DEBUG_DEVICE ? Collections.emptyList()
: Collections.singletonList(DeveloperOptionsFragment.class.getName());
private static final String DEVELOPER_OPTIONS_KEY = "pref_developer_options";
private static final String FLAGS_PREFERENCE_KEY = "flag_toggler";
@VisibleForTesting
static final String DEVELOPER_OPTIONS_KEY = "pref_developer_options";
private static final String NOTIFICATION_DOTS_PREFERENCE_KEY = "pref_icon_badging";
public static final String EXTRA_FRAGMENT_ARG_KEY = ":settings:fragment_args_key";
public static final String EXTRA_SHOW_FRAGMENT_ARGS = ":settings:show_fragment_args";
public static final String EXTRA_FRAGMENT_ARGS = ":settings:fragment_args";
// Intent extra to indicate the pref-key to highlighted when opening the settings activity
public static final String EXTRA_FRAGMENT_HIGHLIGHT_KEY = ":settings:fragment_args_key";
// Intent extra to indicate the pref-key of the root screen when opening the settings activity
public static final String EXTRA_FRAGMENT_ROOT_KEY = ARG_PREFERENCE_ROOT;
private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;
public static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
@VisibleForTesting
static final String EXTRA_FRAGMENT = ":settings:fragment";
@VisibleForTesting
static final String EXTRA_FRAGMENT_ARGS = ":settings:fragment_args";
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.settings_activity);
setActionBar(findViewById(R.id.action_bar));
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
Intent intent = getIntent();
if (intent.hasExtra(EXTRA_FRAGMENT) || intent.hasExtra(EXTRA_FRAGMENT_ARGS)
|| intent.hasExtra(EXTRA_FRAGMENT_ARG_KEY)) {
if (intent.hasExtra(EXTRA_FRAGMENT_ROOT_KEY) || intent.hasExtra(EXTRA_FRAGMENT_ARGS)
|| intent.hasExtra(EXTRA_FRAGMENT_HIGHLIGHT_KEY)) {
getActionBar().setDisplayHomeAsUpEnabled(true);
}
@@ -105,46 +105,24 @@ public class SettingsActivity extends FragmentActivity
args = new Bundle();
}
String prefKey = intent.getStringExtra(EXTRA_FRAGMENT_ARG_KEY);
if (!TextUtils.isEmpty(prefKey)) {
args.putString(EXTRA_FRAGMENT_ARG_KEY, prefKey);
String highlight = intent.getStringExtra(EXTRA_FRAGMENT_HIGHLIGHT_KEY);
if (!TextUtils.isEmpty(highlight)) {
args.putString(EXTRA_FRAGMENT_HIGHLIGHT_KEY, highlight);
}
String root = intent.getStringExtra(EXTRA_FRAGMENT_ROOT_KEY);
if (!TextUtils.isEmpty(root)) {
args.putString(EXTRA_FRAGMENT_ROOT_KEY, root);
}
final FragmentManager fm = getSupportFragmentManager();
final Fragment f = fm.getFragmentFactory().instantiate(getClassLoader(),
getPreferenceFragment());
getString(R.string.settings_fragment_name));
f.setArguments(args);
// Display the fragment as the main content.
fm.beginTransaction().replace(R.id.content_frame, f).commit();
}
LauncherPrefs.getPrefs(getApplicationContext())
.registerOnSharedPreferenceChangeListener(this);
}
/**
* Obtains the preference fragment to instantiate in this activity.
*
* @return the preference fragment class
* @throws IllegalArgumentException if the fragment is unknown to this activity
*/
private String getPreferenceFragment() {
String preferenceFragment = getIntent().getStringExtra(EXTRA_FRAGMENT);
String defaultFragment = getString(R.string.settings_fragment_name);
if (TextUtils.isEmpty(preferenceFragment)) {
return defaultFragment;
} else if (!preferenceFragment.equals(defaultFragment)
&& !VALID_PREFERENCE_FRAGMENTS.contains(preferenceFragment)) {
throw new IllegalArgumentException(
"Invalid fragment for this activity: " + preferenceFragment);
} else {
return preferenceFragment;
}
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }
private boolean startPreference(String fragment, Bundle args, String key) {
if (Utilities.ATLEAST_P && getSupportFragmentManager().isStateSaved()) {
// Sometimes onClick can come after onPause because of being posted on the handler.
@@ -158,7 +136,6 @@ public class SettingsActivity extends FragmentActivity
((DialogFragment) f).show(fm, key);
} else {
startActivity(new Intent(this, SettingsActivity.class)
.putExtra(EXTRA_FRAGMENT, fragment)
.putExtra(EXTRA_FRAGMENT_ARGS, args));
}
return true;
@@ -173,7 +150,7 @@ public class SettingsActivity extends FragmentActivity
@Override
public boolean onPreferenceStartScreen(PreferenceFragmentCompat caller, PreferenceScreen pref) {
Bundle args = new Bundle();
args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, pref.getKey());
args.putString(ARG_PREFERENCE_ROOT, pref.getKey());
return startPreference(getString(R.string.settings_fragment_name), args, pref.getKey());
}
@@ -189,19 +166,31 @@ public class SettingsActivity extends FragmentActivity
/**
* This fragment shows the launcher preferences.
*/
public static class LauncherSettingsFragment extends PreferenceFragmentCompat {
public static class LauncherSettingsFragment extends PreferenceFragmentCompat implements
SettingsCache.OnChangeListener {
protected boolean mDeveloperOptionsEnabled = false;
private boolean mRestartOnResume = false;
private String mHighLightKey;
private boolean mPreferenceHighlighted = false;
private Preference mDeveloperOptionPref;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
if (BuildConfig.IS_DEBUG_DEVICE) {
Uri devUri = Settings.Global.getUriFor(DEVELOPMENT_SETTINGS_ENABLED);
SettingsCache settingsCache = SettingsCache.INSTANCE.get(getContext());
mDeveloperOptionsEnabled = settingsCache.getValue(devUri);
settingsCache.register(devUri, this);
}
super.onCreate(savedInstanceState);
}
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
final Bundle args = getArguments();
mHighLightKey = args == null ? null : args.getString(EXTRA_FRAGMENT_ARG_KEY);
if (rootKey == null && !TextUtils.isEmpty(mHighLightKey)) {
rootKey = getParentKeyForPref(mHighLightKey);
}
mHighLightKey = args == null ? null : args.getString(EXTRA_FRAGMENT_HIGHLIGHT_KEY);
if (savedInstanceState != null) {
mPreferenceHighlighted = savedInstanceState.getBoolean(SAVE_HIGHLIGHTED_KEY);
@@ -213,11 +202,7 @@ public class SettingsActivity extends FragmentActivity
PreferenceScreen screen = getPreferenceScreen();
for (int i = screen.getPreferenceCount() - 1; i >= 0; i--) {
Preference preference = screen.getPreference(i);
if (initPreference(preference)) {
if (IS_STUDIO_BUILD && preference == mDeveloperOptionPref) {
preference.setOrder(0);
}
} else {
if (!initPreference(preference)) {
screen.removePreference(preference);
}
}
@@ -249,6 +234,7 @@ public class SettingsActivity extends FragmentActivity
bottomPadding + insets.getSystemWindowInsetBottom());
return insets.consumeSystemWindowInsets();
});
// Overriding Text Direction in the Androidx preference library to support RTL
view.setTextDirection(View.TEXT_DIRECTION_LOCALE);
}
@@ -259,10 +245,6 @@ public class SettingsActivity extends FragmentActivity
outState.putBoolean(SAVE_HIGHLIGHTED_KEY, mPreferenceHighlighted);
}
protected String getParentKeyForPref(String key) {
return null;
}
/**
* Initializes a preference. This is called for every preference. Returning false here
* will remove that preference from the list.
@@ -283,42 +265,26 @@ public class SettingsActivity extends FragmentActivity
preference.setDefaultValue(RotationHelper.getAllowRotationDefaultValue(info));
return true;
case FLAGS_PREFERENCE_KEY:
// Only show flag toggler UI if this build variant implements that.
return FeatureFlags.showFlagTogglerUi(getContext());
case DEVELOPER_OPTIONS_KEY:
mDeveloperOptionPref = preference;
return updateDeveloperOption();
if (IS_STUDIO_BUILD) {
preference.setOrder(0);
}
return mDeveloperOptionsEnabled;
case "pref_developer_flags":
if (mDeveloperOptionsEnabled && preference instanceof PreferenceCategory pc) {
Executors.MAIN_EXECUTOR.post(() -> new DeveloperOptionsUI(this, pc));
return true;
}
return false;
}
return true;
}
/**
* Show if plugins are enabled or flag UI is enabled.
* @return True if we should show the preference option.
*/
private boolean updateDeveloperOption() {
boolean showPreference = FeatureFlags.showFlagTogglerUi(getContext())
|| PluginManagerWrapper.hasPlugins(getContext());
if (mDeveloperOptionPref != null) {
mDeveloperOptionPref.setEnabled(showPreference);
if (showPreference) {
getPreferenceScreen().addPreference(mDeveloperOptionPref);
} else {
getPreferenceScreen().removePreference(mDeveloperOptionPref);
}
}
return showPreference;
}
@Override
public void onResume() {
super.onResume();
updateDeveloperOption();
if (isAdded() && !mPreferenceHighlighted) {
PreferenceHighlighter highlighter = createHighlighter();
if (highlighter != null) {
@@ -328,6 +294,43 @@ public class SettingsActivity extends FragmentActivity
requestAccessibilityFocus(getListView());
}
}
if (mRestartOnResume) {
recreateActivityNow();
}
}
@Override
public void onSettingsChanged(boolean isEnabled) {
// Developer options changed, try recreate
tryRecreateActivity();
}
@Override
public void onDestroy() {
super.onDestroy();
if (IS_DEBUG_DEVICE) {
SettingsCache.INSTANCE.get(getContext())
.unregister(Settings.Global.getUriFor(DEVELOPMENT_SETTINGS_ENABLED), this);
}
}
/**
* Tries to recreate the preference
*/
protected void tryRecreateActivity() {
if (isResumed()) {
recreateActivityNow();
} else {
mRestartOnResume = true;
}
}
private void recreateActivityNow() {
Activity activity = getActivity();
if (activity != null) {
activity.recreate();
}
}
private PreferenceHighlighter createHighlighter() {
src/com/android/launcher3/util/SettingsCache.java
+5 -18
View File
@@ -25,8 +25,6 @@ import android.net.Uri;
import android.os.Handler;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -61,6 +59,7 @@ public class SettingsCache extends ContentObserver implements SafeCloseable {
Settings.System.getUriFor(ACCELEROMETER_ROTATION);
private static final String SYSTEM_URI_PREFIX = Settings.System.CONTENT_URI.toString();
private static final String GLOBAL_URI_PREFIX = Settings.Global.CONTENT_URI.toString();
/**
* Caches the last seen value for registered keys.
@@ -139,6 +138,8 @@ public class SettingsCache extends ContentObserver implements SafeCloseable {
boolean newVal;
if (keyUri.toString().startsWith(SYSTEM_URI_PREFIX)) {
newVal = Settings.System.getInt(mResolver, key, defaultValue) == 1;
} else if (keyUri.toString().startsWith(GLOBAL_URI_PREFIX)) {
newVal = Settings.Global.getInt(mResolver, key, defaultValue) == 1;
} else { // SETTING_SECURE
newVal = Settings.Secure.getInt(mResolver, key, defaultValue) == 1;
}
@@ -154,23 +155,9 @@ public class SettingsCache extends ContentObserver implements SafeCloseable {
*/
public void unregister(Uri uri, OnChangeListener listener) {
List<OnChangeListener> listenersToRemoveFrom = mListenerMap.get(uri);
if (listenersToRemoveFrom == null) {
return;
if (listenersToRemoveFrom != null) {
listenersToRemoveFrom.remove(listener);
}
listenersToRemoveFrom.remove(listener);
if (listenersToRemoveFrom.isEmpty()) {
mListenerMap.remove(uri);
}
}
/**
* Don't use this. Ever.
* @param keyCache Cache to replace {@link #mKeyCache}
*/
@VisibleForTesting
void setKeyCache(Map<Uri, Boolean> keyCache) {
mKeyCache = keyCache;
}
public interface OnChangeListener {