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

Merge "Show "work mode off" dialog when work notification setting is clicked" into nyc-dev

Browse Source 
am: 697f3a6

* commit '697f3a6ce21319d4e8f666633b4888fa8dfb0a50':
  Show "work mode off" dialog when work notification setting is clicked

Change-Id: I3385090466d1a601e451bee0b166b784c12df2e8
This commit is contained in:
Ricky Wai
2016-04-15 14:42:46 +00:00
committed by android-build-merger
parent 7cca80d68c 697f3a6ce2
commit ab8a79616f
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,7 +213,7 @@ public class ConfigureNotificationSettings extends SettingsPreferenceFragment {
Log.i(TAG, "Preference not found: " + KEY_LOCK_SCREEN_PROFILE_NOTIFICATIONS);
return;
}
mLockscreenProfile.setUserId(mProfileChallengeUserId);
ArrayList<CharSequence> entries = new ArrayList<>();
ArrayList<CharSequence> values = new ArrayList<>();
entries.add(getString(R.string.lock_screen_notifications_summary_disable_profile));

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

@@ -18,11 +18,14 @@ package com.android.settings.notification;
import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.Utils;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.util.AttributeSet;
import android.view.View;
@@ -38,6 +41,7 @@ public class NotificationLockscreenPreference extends RestrictedListPreference {
private Listener mListener;
private boolean mShowRemoteInput;
private boolean mRemoteInputCheckBoxEnabled = true;
private int mUserId = UserHandle.myUserId();
public NotificationLockscreenPreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -47,6 +51,20 @@ public class NotificationLockscreenPreference extends RestrictedListPreference {
mRemoteInputCheckBoxEnabled = enabled;
}
@Override
protected void onClick() {
final Context context = getContext();
if (!Utils.startQuietModeDialogIfNecessary(context, UserManager.get(context), mUserId)) {
// Call super to create preference dialog only when work mode is on
// startQuietModeDialogIfNecessary will return false if mUserId is not a managed user
super.onClick();
}
}
public void setUserId(int userId) {
mUserId = userId;
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
DialogInterface.OnClickListener innerListener) {