From 0aa1dc70c5360f1e2ff251b6d1793860f1669684 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Tue, 6 Aug 2013 10:46:51 -0700 Subject: Remove Restrictions UI Bug: 10200097 Change-Id: Ifaa8aaa9aa5ad17a948bf18f184a131295112a30 --- res/xml/settings_headers.xml | 8 -- src/com/android/settings/Settings.java | 6 - .../settings/users/RestrictionSettings.java | 152 --------------------- 3 files changed, 166 deletions(-) delete mode 100644 src/com/android/settings/users/RestrictionSettings.java diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index 9a1d3b8..867fc19 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -97,13 +97,6 @@ android:title="@string/applications_settings" android:id="@+id/application_settings" /> - -
-
-
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 54f64c8..1f6f4c5 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -136,7 +136,6 @@ public class Settings extends PreferenceActivity R.id.location_settings, R.id.security_settings, R.id.language_settings, - R.id.restriction_settings, R.id.user_settings, R.id.account_settings, R.id.account_add, @@ -557,11 +556,6 @@ public class Settings extends PreferenceActivity if (um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) { target.remove(i); } - } else if (id == R.id.restriction_settings) { - if (um.isLinkedUser() - || um.hasUserRestriction(UserManager.DISALLOW_APP_RESTRICTIONS)) { - target.remove(i); - } } if (i < target.size() && target.get(i) == header diff --git a/src/com/android/settings/users/RestrictionSettings.java b/src/com/android/settings/users/RestrictionSettings.java deleted file mode 100644 index 91b8bd3..0000000 --- a/src/com/android/settings/users/RestrictionSettings.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright (C) 2013 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.app.Activity; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.os.Bundle; -import android.os.UserHandle; -import android.os.UserManager; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; - -import com.android.settings.R; - -import java.util.List; - -/** - * Used for restricting regular users, including single-user devices. - */ -public class RestrictionSettings extends AppRestrictionsFragment { - - private static final int REQUEST_PIN_CHALLENGE = 10; - - private static final int MENU_RESET = Menu.FIRST + 1; - private static final int MENU_CHANGE_PIN = Menu.FIRST + 2; - - private static final String KEY_CHALLENGE_SUCCEEDED = "chsc"; - private static final String KEY_CHALLENGE_REQUESTED = "chrq"; - - private boolean mChallengeSucceeded; - private boolean mChallengeRequested; - private boolean mDisableSelf; - - public void onCreate(Bundle icicle) { - super.onCreate(icicle); - if (UserManager.get(getActivity()).hasUserRestriction( - UserManager.DISALLOW_APP_RESTRICTIONS)) { - mDisableSelf = true; - return; - } - init(icicle); - if (icicle != null) { - mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false); - mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false); - } - setHasOptionsMenu(true); - } - - public void onResume() { - super.onResume(); - if (!mDisableSelf) { - ensurePin(); - } - } - - private void ensurePin() { - if (!mChallengeSucceeded) { - getListView().setEnabled(false); - final UserManager um = UserManager.get(getActivity()); - if (!mChallengeRequested) { - if (um.hasRestrictionsPin()) { - Intent requestPin = - new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE); - startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE); - } else { - Intent requestPin = - new Intent("android.intent.action.RESTRICTIONS_PIN_CREATE"); - startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE); - } - mChallengeRequested = true; - } - } - mChallengeSucceeded = false; - } - - private void resetAndRemovePin() { - final UserManager um = UserManager.get(getActivity()); - um.removeRestrictions(); - clearSelectedApps(); - finishFragment(); - } - - private void changePin() { - final UserManager um = UserManager.get(getActivity()); - Intent requestPin = new Intent("android.intent.action.RESTRICTIONS_PIN_CREATE"); - startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE); - } - - public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == REQUEST_PIN_CHALLENGE) { - mChallengeRequested = false; - if (resultCode == Activity.RESULT_OK) { - getListView().setEnabled(true); - mChallengeSucceeded = true; - } else if (!isDetached()) { - finishFragment(); - } - return; - } - - super.onActivityResult(requestCode, resultCode, data); - } - - public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - - outState.putBoolean(KEY_CHALLENGE_REQUESTED, mChallengeRequested); - if (getActivity().isChangingConfigurations()) { - outState.putBoolean(KEY_CHALLENGE_SUCCEEDED, mChallengeSucceeded); - } - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - if (!mDisableSelf) { - menu.add(0, MENU_RESET, 0, R.string.restriction_menu_reset); - menu.add(0, MENU_CHANGE_PIN, 0, R.string.restriction_menu_change_pin); - } - super.onCreateOptionsMenu(menu, inflater); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case MENU_RESET: - resetAndRemovePin(); - return true; - case MENU_CHANGE_PIN: - changePin(); - return true; - } - - return super.onOptionsItemSelected(item); - } -} -- cgit v1.1