Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ifa1155d2a3ae19ff743b29b47e088d5d42724f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-26 17:44:20 +00:00
committed by Automerger Merge Worker
3 changed files with 159 additions and 16 deletions

View File

@@ -28,6 +28,7 @@ import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.UserManager;
import android.print.PrintJob;
import android.print.PrintJobId;
import android.print.PrintJobInfo;
@@ -45,6 +46,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import androidx.loader.app.LoaderManager.LoaderCallbacks;
import androidx.loader.content.AsyncTaskLoader;
import androidx.loader.content.Loader;
@@ -92,6 +94,22 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
private PrintServicesController mPrintServicesController;
private Button mAddNewServiceButton;
@VisibleForTesting
boolean mIsUiRestricted;
public PrintSettingsFragment() {
super(UserManager.DISALLOW_PRINTING);
}
@Override
protected String getLogTag() {
return TAG;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.print_settings;
}
@Override
public int getMetricsCategory() {
@@ -107,12 +125,19 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View root = super.onCreateView(inflater, container, savedInstanceState);
addPreferencesFromResource(R.xml.print_settings);
mIsUiRestricted = isUiRestricted();
setupPreferences();
return root;
}
mActivePrintJobsCategory = (PreferenceCategory) findPreference(
PRINT_JOBS_CATEGORY);
mPrintServicesCategory = (PreferenceCategory) findPreference(
PRINT_SERVICES_CATEGORY);
@VisibleForTesting
void setupPreferences() {
if (mIsUiRestricted) {
return;
}
mActivePrintJobsCategory = (PreferenceCategory) findPreference(PRINT_JOBS_CATEGORY);
mPrintServicesCategory = (PreferenceCategory) findPreference(PRINT_SERVICES_CATEGORY);
getPreferenceScreen().removePreference(mActivePrintJobsCategory);
mPrintJobsController = new PrintJobsController();
@@ -120,20 +145,20 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
mPrintServicesController = new PrintServicesController();
getLoaderManager().initLoader(LOADER_ID_PRINT_SERVICES, null, mPrintServicesController);
return root;
}
@Override
public void onStart() {
super.onStart();
setHasOptionsMenu(true);
startSubSettingsIfNeeded();
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
setupEmptyViews();
}
@VisibleForTesting
void setupEmptyViews() {
if (mIsUiRestricted) {
return;
}
ViewGroup contentRoot = (ViewGroup) getListView().getParent();
View emptyView = getActivity().getLayoutInflater().inflate(
R.layout.empty_print_state, contentRoot, false);
@@ -152,6 +177,23 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
setEmptyView(emptyView);
}
@Override
public void onStart() {
super.onStart();
startSettings();
}
@VisibleForTesting
void startSettings() {
if (mIsUiRestricted) {
getPreferenceScreen().removeAll();
return;
}
setHasOptionsMenu(true);
startSubSettingsIfNeeded();
}
@Override
protected String getIntentActionString() {
return Settings.ACTION_PRINT_SETTINGS;

View File

@@ -27,13 +27,17 @@ import android.widget.AdapterView;
import android.widget.Spinner;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.dashboard.profileselector.UserAdapter;
/**
* Base fragment class for per profile settings.
*/
public abstract class ProfileSettingsPreferenceFragment extends SettingsPreferenceFragment {
public abstract class ProfileSettingsPreferenceFragment extends RestrictedDashboardFragment {
public ProfileSettingsPreferenceFragment(String restrictionKey) {
super(restrictionKey);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {