Merge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982" into nyc-dev
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index c342ba0..9acac06 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -213,7 +213,7 @@
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));
diff --git a/src/com/android/settings/notification/NotificationLockscreenPreference.java b/src/com/android/settings/notification/NotificationLockscreenPreference.java
index cd3e30c..8c89968 100644
--- a/src/com/android/settings/notification/NotificationLockscreenPreference.java
+++ b/src/com/android/settings/notification/NotificationLockscreenPreference.java
@@ -18,11 +18,14 @@
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 @@
private Listener mListener;
private boolean mShowRemoteInput;
private boolean mRemoteInputCheckBoxEnabled = true;
+ private int mUserId = UserHandle.myUserId();
public NotificationLockscreenPreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -48,6 +52,20 @@
}
@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) {