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

Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-05-12 20:52:24 +00:00
committed by Android (Google) Code Review
parent 1590b8c005 059b0fa060
commit ef505d628a
8 changed files with 138 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/notification/ConfigureNotificationSettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.notification;
import android.app.admin.DevicePolicyManager;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
@@ -177,6 +178,9 @@ public class ConfigureNotificationSettings extends SettingsPreferenceFragment {
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
}
mLockscreen.setRemoteInputRestricted(RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
mContext, DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT, UserHandle.myUserId()));
mLockscreen.setEntries(entries.toArray(new CharSequence[entries.size()]));
mLockscreen.setEntryValues(values.toArray(new CharSequence[values.size()]));
updateLockscreenNotifications();
@@ -239,6 +243,10 @@ public class ConfigureNotificationSettings extends SettingsPreferenceFragment {
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
}
mLockscreen.setRemoteInputRestricted(RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
mContext, DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT,
mProfileChallengeUserId));
mLockscreenProfile.setEntries(entries.toArray(new CharSequence[entries.size()]));
mLockscreenProfile.setEntryValues(values.toArray(new CharSequence[values.size()]));
// Work profile does not support this settings as we do not have a policy to enforce it yet

33
src/com/android/settings/notification/NotificationLockscreenPreference.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.notification;
import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -32,6 +33,7 @@ import android.util.AttributeSet;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.ListAdapter;
import android.widget.ListView;
@@ -42,6 +44,7 @@ public class NotificationLockscreenPreference extends RestrictedListPreference {
private boolean mShowRemoteInput;
private boolean mRemoteInputCheckBoxEnabled = true;
private int mUserId = UserHandle.myUserId();
private RestrictedLockUtils.EnforcedAdmin mAdminRestrictingRemoteInput;
public NotificationLockscreenPreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -51,6 +54,10 @@ public class NotificationLockscreenPreference extends RestrictedListPreference {
mRemoteInputCheckBoxEnabled = enabled;
}
public void setRemoteInputRestricted(RestrictedLockUtils.EnforcedAdmin admin) {
mAdminRestrictingRemoteInput = admin;
}
@Override
protected void onClick() {
final Context context = getContext();
@@ -81,9 +88,19 @@ public class NotificationLockscreenPreference extends RestrictedListPreference {
protected void onDialogCreated(Dialog dialog) {
super.onDialogCreated(dialog);
dialog.create();
CheckBox view = (CheckBox) dialog.findViewById(R.id.lockscreen_remote_input);
view.setChecked(!mAllowRemoteInput);
view.setOnCheckedChangeListener(mListener);
CheckBox checkbox = (CheckBox) dialog.findViewById(R.id.lockscreen_remote_input);
checkbox.setChecked(!mAllowRemoteInput);
checkbox.setOnCheckedChangeListener(mListener);
checkbox.setEnabled(mAdminRestrictingRemoteInput == null);
View restricted = dialog.findViewById(R.id.restricted_lock_icon_remote_input);
restricted.setVisibility(mAdminRestrictingRemoteInput == null ? View.GONE : View.VISIBLE);
if (mAdminRestrictingRemoteInput != null) {
checkbox.setClickable(false);
dialog.findViewById(com.android.internal.R.id.customPanel)
.setOnClickListener(mListener);
}
}
@Override
@@ -122,7 +139,7 @@ public class NotificationLockscreenPreference extends RestrictedListPreference {
}
private class Listener implements DialogInterface.OnClickListener,
CompoundButton.OnCheckedChangeListener {
CompoundButton.OnCheckedChangeListener, View.OnClickListener {
private final DialogInterface.OnClickListener mInner;
private View mView;
@@ -150,5 +167,13 @@ public class NotificationLockscreenPreference extends RestrictedListPreference {
public void setView(View view) {
mView = view;
}
@Override
public void onClick(View v) {
if (v.getId() == com.android.internal.R.id.customPanel) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
mAdminRestrictingRemoteInput);
}
}
}
}

10
src/com/android/settings/notification/RedactionInterstitial.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.notification;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -32,6 +33,7 @@ import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.RestrictedCheckBox;
import com.android.settings.RestrictedRadioButton;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -81,7 +83,7 @@ public class RedactionInterstitial extends SettingsActivity {
private RadioGroup mRadioGroup;
private RestrictedRadioButton mShowAllButton;
private RestrictedRadioButton mRedactSensitiveButton;
private CheckBox mRemoteInputCheckbox;
private RestrictedCheckBox mRemoteInputCheckbox;
private int mUserId;
@Override
@@ -102,7 +104,8 @@ public class RedactionInterstitial extends SettingsActivity {
mShowAllButton = (RestrictedRadioButton) view.findViewById(R.id.show_all);
mRedactSensitiveButton =
(RestrictedRadioButton) view.findViewById(R.id.redact_sensitive);
mRemoteInputCheckbox = (CheckBox) view.findViewById(R.id.lockscreen_remote_input);
mRemoteInputCheckbox =
(RestrictedCheckBox) view.findViewById(R.id.lockscreen_remote_input);
mRemoteInputCheckbox.setOnCheckedChangeListener(this);
mRadioGroup.setOnCheckedChangeListener(this);
@@ -129,6 +132,9 @@ public class RedactionInterstitial extends SettingsActivity {
KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
checkNotificationFeaturesAndSetDisabled(mRedactSensitiveButton,
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
mRemoteInputCheckbox.setDisabledByAdmin(
RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(getActivity(),
DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT, mUserId));
loadFromSettings();
}