Merge "Remove injecting multi-user settings into settings itself" into main (a930f5ea) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+0 −10

Original line number	Diff line number	Diff line
		@@ -3389,16 +3389,6 @@
		<action android:name="android.settings.USER_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		<meta-data android:name="com.android.settings.order" android:value="-45"/>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.system" />
		<meta-data android:name="com.android.settings.summary_uri"
		android:value="content://com.android.settings.dashboard.SummaryProvider/user" />
		<meta-data android:name="com.android.settings.icon"
		android:resource="@drawable/ic_settings_multiuser" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.users.UserSettings" />
		<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

+8 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,14 @@
		<intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>
		</Preference>

		<Preference
		android:key="system_multiuser"
		android:title="@string/user_settings_title"
		android:icon="@drawable/ic_settings_multiuser"
		android:order="-45"
		android:fragment="com.android.settings.users.UserSettings"
		settings:controller="com.android.settings.users.MultiUserPreferenceController"/>

		<Preference
		android:key="reset_dashboard"
		android:title="@string/reset_dashboard_title"

+0 −6

Original line number	Diff line number	Diff line
		@@ -781,12 +781,6 @@ public class SettingsActivity extends SettingsBaseActivity
		Utils.isBandwidthControlEnabled(), isAdmin)
		\|\| somethingChanged;

		somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
		Settings.UserSettingsActivity.class.getName()),
		UserHandle.MU_ENABLED && UserManager.supportsMultipleUsers()
		&& !Utils.isMonkeyRunning(), isAdmin)
		\|\| somethingChanged;

		final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
		&& !Utils.isMonkeyRunning();
		somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

+0 −13

Original line number	Diff line number	Diff line
		@@ -20,15 +20,10 @@ import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMM

		import android.content.ContentProvider;
		import android.content.ContentValues;
		import android.content.Context;
		import android.content.pm.UserInfo;
		import android.database.Cursor;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.os.UserManager;

		import com.android.settings.R;
		import com.android.settings.backup.BackupSettingsHelper;

		/** Provide preference summary for injected items. */
		@@ -44,14 +39,6 @@ public class SummaryProvider extends ContentProvider {
		bundle.putString(META_DATA_PREFERENCE_SUMMARY,
		new BackupSettingsHelper(getContext()).getSummary());
		break;
		case USER:
		final Context context = getContext();
		final UserInfo info = context.getSystemService(UserManager.class).getUserInfo(
		UserHandle.myUserId());
		bundle.putString(META_DATA_PREFERENCE_SUMMARY,
		context.getString(R.string.users_summary,
		info.name));
		break;
		default:
		throw new IllegalArgumentException("Unknown Uri format: " + uri);
		}

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.settings.users;

		import android.content.Context;
		import android.content.pm.UserInfo;
		import android.os.UserHandle;
		import android.os.UserManager;

		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.core.BasePreferenceController;

		public class MultiUserPreferenceController extends BasePreferenceController {

		public MultiUserPreferenceController(Context context, String preferenceKey) {
		super(context, preferenceKey);
		}

		@Override
		public int getAvailabilityStatus() {
		return (UserHandle.MU_ENABLED && UserManager.supportsMultipleUsers()
		&& !Utils.isMonkeyRunning()) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		}

		@Override
		public CharSequence getSummary() {
		UserManager um = mContext.getSystemService(UserManager.class);
		UserInfo info = um.getUserInfo(UserHandle.myUserId());
		return mContext.getString(R.string.users_summary, info.name);
		}
		}