Merge "Use getFlashLockState API to check lock state" into nyc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b3d1d61..ceea92e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1968,6 +1968,17 @@
android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
</activity>
+ <activity android:name=".RemoteBugreportActivity"
+ android:excludeFromRecents="true"
+ android:exported="true"
+ android:permission="android.permission.DUMP"
+ android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
+ <intent-filter>
+ <action android:name="android.settings.SHOW_REMOTE_BUGREPORT_DIALOG" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name=".bluetooth.RequestPermissionHelperActivity"
android:label="@string/bluetooth_pairing_request"
android:excludeFromRecents="true"
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index 06dc6aa..aafeb1b 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -65,4 +65,14 @@
</RadioGroup>
+ <CheckBox
+ android:id="@+id/lockscreen_remote_input"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/redaction_vertical_margins"
+ android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+ android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:text="@string/lockscreen_remote_input"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/zen_settings_menu.xml b/res/menu/zen_settings_menu.xml
deleted file mode 100644
index ff28403..0000000
--- a/res/menu/zen_settings_menu.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/zen_access"
- android:title="@string/manage_zen_access_title"
- android:showAsAction="never" />
-</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1c78f56..f04224f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6689,6 +6689,19 @@
<!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
<string name="additional_permissions_more"><xliff:g id="count" example="2">%1$d</xliff:g> more</string>
+ <!-- Title of dialog shown to ask for user consent for sharing a bugreport that was requested remotely by the IT administrator. -->
+ <string name="share_remote_bugreport_dialog_title">Share bug report?</string>
+ <!-- Message of a dialog shown to ask for user consent for sharing a bugreport that was requested remotely by the IT administrator. -->
+ <string name="share_remote_bugreport_dialog_message_finished">Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared.</string>
+ <!-- Message of a dialog shown to ask for user consent for sharing a bugreport that was requested remotely by the IT administrator and it's still being taken. -->
+ <string name="share_remote_bugreport_dialog_message">Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared, and your device may temporarily slow down.</string>
+ <!-- Message of a dialog shown to inform that the remote bugreport that was requested remotely by the IT administrator is still being taken and will be shared when finished. -->
+ <string name="sharing_remote_bugreport_dialog_message">This bug report is being shared with your IT admin. Contact them for more details.</string>
+ <!-- Acceptance label of dialog shown to ask for user consent for sharing the remote bugreport. -->
+ <string name="share_remote_bugreport_action">Share</string>
+ <!-- Decline label of dialog shown to ask for user consent for sharing the remote bugreport. -->
+ <string name="decline_remote_bugreport_action">Decline</string>
+
<!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice
is for charging only. -->
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index cb93792..3574aed 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -30,17 +30,4 @@
android:title="@string/lock_screen_notifications_title"
android:summary="%s" />
- <PreferenceCategory
- android:key="advanced"
- android:title="@string/advanced_section_header" >
-
- <!-- Notification access -->
- <Preference
- android:key="manage_notification_access"
- android:title="@string/manage_notification_access_title"
- android:persistent="false"
- android:fragment="com.android.settings.notification.NotificationAccessSettings" />
-
- </PreferenceCategory>
-
</PreferenceScreen>
diff --git a/src/com/android/settings/RemoteBugreportActivity.java b/src/com/android/settings/RemoteBugreportActivity.java
new file mode 100644
index 0000000..0589a24
--- /dev/null
+++ b/src/com/android/settings/RemoteBugreportActivity.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2016 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;
+
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.util.Log;
+import android.widget.LinearLayout;
+
+import com.android.settings.R;
+
+/**
+ * UI for the remote bugreport dialog. Shows one of 3 possible dialogs:
+ * <ul>
+ * <li>bugreport is still being taken and can be shared or declined</li>
+ * <li>bugreport has been taken and can be shared or declined</li>
+ * <li>bugreport has already been accepted to be shared, but is still being taken</li>
+ * </ul>
+ */
+public class RemoteBugreportActivity extends Activity {
+
+ private static final String TAG = "RemoteBugreportActivity";
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ final int notificationType = getIntent().getIntExtra(
+ DevicePolicyManager.EXTRA_BUGREPORT_NOTIFICATION_TYPE, -1);
+
+ if (notificationType == DevicePolicyManager.NOTIFICATION_BUGREPORT_ACCEPTED_NOT_FINISHED) {
+ AlertDialog dialog = new AlertDialog.Builder(this)
+ .setMessage(R.string.sharing_remote_bugreport_dialog_message)
+ .setOnDismissListener(new DialogInterface.OnDismissListener() {
+ @Override
+ public void onDismiss(DialogInterface dialog) {
+ finish();
+ }
+ })
+ .setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ finish();
+ }
+ })
+ .create();
+ dialog.show();
+ } else if (notificationType == DevicePolicyManager.NOTIFICATION_BUGREPORT_STARTED
+ || notificationType
+ == DevicePolicyManager.NOTIFICATION_BUGREPORT_FINISHED_NOT_ACCEPTED) {
+ AlertDialog dialog = new AlertDialog.Builder(this)
+ .setTitle(R.string.share_remote_bugreport_dialog_title)
+ .setMessage(notificationType
+ == DevicePolicyManager.NOTIFICATION_BUGREPORT_STARTED
+ ? R.string.share_remote_bugreport_dialog_message
+ : R.string.share_remote_bugreport_dialog_message_finished)
+ .setOnDismissListener(new DialogInterface.OnDismissListener() {
+ @Override
+ public void onDismiss(DialogInterface dialog) {
+ finish();
+ }
+ })
+ .setNegativeButton(R.string.decline_remote_bugreport_action,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ Intent intent = new Intent(
+ DevicePolicyManager.ACTION_BUGREPORT_SHARING_DECLINED);
+ RemoteBugreportActivity.this.sendBroadcastAsUser(intent,
+ UserHandle.SYSTEM, android.Manifest.permission.DUMP);
+ finish();
+ }
+ })
+ .setPositiveButton(R.string.share_remote_bugreport_action,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ Intent intent = new Intent(
+ DevicePolicyManager.ACTION_BUGREPORT_SHARING_ACCEPTED);
+ RemoteBugreportActivity.this.sendBroadcastAsUser(intent,
+ UserHandle.SYSTEM, android.Manifest.permission.DUMP);
+ finish();
+ }
+ })
+ .create();
+ dialog.show();
+ } else {
+ Log.e(TAG, "Incorrect dialog type, no dialog shown. Received: " + notificationType);
+ }
+ }
+}
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index bd1dfe8..abadb8b 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -24,6 +24,8 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
@@ -74,11 +76,12 @@
}
public static class RedactionInterstitialFragment extends SettingsPreferenceFragment
- implements RadioGroup.OnCheckedChangeListener {
+ implements RadioGroup.OnCheckedChangeListener, CompoundButton.OnCheckedChangeListener {
private RadioGroup mRadioGroup;
private RestrictedRadioButton mShowAllButton;
private RestrictedRadioButton mRedactSensitiveButton;
+ private CheckBox mRemoteInputCheckbox;
private int mUserId;
@Override
@@ -99,6 +102,8 @@
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.setOnCheckedChangeListener(this);
mRadioGroup.setOnCheckedChangeListener(this);
mUserId = Utils.getUserIdFromBundle(
@@ -150,6 +155,12 @@
}
mRadioGroup.check(checkedButtonId);
+
+ boolean allowRemoteInput = Settings.Secure.getIntForUser(getContentResolver(),
+ Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT, 0, mUserId) != 0;
+ mRemoteInputCheckbox.setChecked(!allowRemoteInput);
+
+ updateRemoteInputCheckboxVisibility();
}
@Override
@@ -161,6 +172,21 @@
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, show ? 1 : 0, mUserId);
Settings.Secure.putIntForUser(getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0, mUserId);
+
+ updateRemoteInputCheckboxVisibility();
+ }
+
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean checked) {
+ if (buttonView == mRemoteInputCheckbox) {
+ Settings.Secure.putIntForUser(getContentResolver(),
+ Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT, checked ? 0 : 1, mUserId);
+ }
+ }
+
+ private void updateRemoteInputCheckboxVisibility() {
+ boolean visible = mRadioGroup.getCheckedRadioButtonId() == R.id.show_all;
+ mRemoteInputCheckbox.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
}
}
}
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 297029e..8cca84f 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -78,23 +78,6 @@
updateVisualSettingsSummary();
}
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.zen_settings_menu, menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.zen_access:
- ((SettingsActivity) getActivity()).startPreferencePanel(
- ZenAccessSettings.class.getCanonicalName(), null,
- R.string.manage_zen_access_title, null, this, 0);
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
private void updatePrioritySettingsSummary() {
String s = getResources().getString(R.string.zen_mode_alarms);
s = appendLowercase(s, isCategoryEnabled(mPolicy, Policy.PRIORITY_CATEGORY_REMINDERS),
diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java
index 33b6a95..a5cecde 100644
--- a/src/com/android/settings/users/RestrictionUtils.java
+++ b/src/com/android/settings/users/RestrictionUtils.java
@@ -78,9 +78,8 @@
public static void setRestrictions(Context context, ArrayList<RestrictionEntry> entries,
UserHandle user) {
UserManager um = UserManager.get(context);
-
for (RestrictionEntry entry : entries) {
- um.setUserRestriction(entry.getKey(), !entry.getSelectedState());
+ um.setUserRestriction(entry.getKey(), !entry.getSelectedState(), user);
}
}
}