diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 634d6841507..edb63c18086 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1968,6 +1968,17 @@ android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"> + + + + + + + %1$d more + + Share bug report? + + Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared. + + 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. + + This bug report is being shared with your IT admin. Contact them for more details. + + Share + + Decline + diff --git a/src/com/android/settings/RemoteBugreportActivity.java b/src/com/android/settings/RemoteBugreportActivity.java new file mode 100644 index 00000000000..0589a24c50b --- /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: + * + */ +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); + } + } +}