am ea819b07: Merge "Implement issue #6819955: Add button to take bug report." into jb-dev (b2a16b92) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -3380,6 +3380,16 @@
		<!-- Summary text of the "automatic restore" setting -->
		<string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string>

		<!-- Take bug report menu title [CHAR LIMIT=NONE] -->
		<string name="bugreport_title">Take bug report</string>
		<!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
		<string name="bugreport_message">This will collect information about your
		current device state, to send as an e-mail message. It will take a little
		time from starting the bug report until it is ready to be sent; please be
		patient.</string>
		<!-- Button in bugreport dialog to confirm starting the report [CHAR LIMIT=NONE] -->
		<string name="report">Report</string>

		<!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
		<string name="local_backup_password_title">Desktop backup password</string>
		<!-- Summary text of the "local backup password" setting when the user has not supplied a password -->

res/xml/development_prefs.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,11 @@

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		android:title="@string/development_settings_title">
		<com.android.settings.BugreportPreference
		android:key="bugreport"
		android:title="@string/bugreport_title"
		android:dialogTitle="@string/bugreport_title" />

		<PreferenceScreen
		android:key="local_backup_password"
		android:title="@string/local_backup_password_title"

src/com/android/settings/BugreportPreference.java

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 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.app.AlertDialog.Builder;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.os.Bundle;
		import android.os.SystemProperties;
		import android.preference.DialogPreference;
		import android.util.AttributeSet;
		import android.view.View;

		public class BugreportPreference extends DialogPreference {
		public BugreportPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		@Override
		protected void onPrepareDialogBuilder(Builder builder) {
		super.onPrepareDialogBuilder(builder);
		builder.setPositiveButton(R.string.report, this);
		builder.setMessage(R.string.bugreport_message);
		}

		@Override
		protected void showDialog(Bundle state) {
		super.showDialog(state);
		}

		@Override
		protected void onBindDialogView(View view) {
		super.onBindDialogView(view);
		}

		@Override
		protected void onDialogClosed(boolean positiveResult) {
		super.onDialogClosed(positiveResult);
		}

		@Override
		public void onClick(DialogInterface dialog, int which) {
		if (which == DialogInterface.BUTTON_POSITIVE) {
		SystemProperties.set("ctl.start", "bugreport");
		}
		}
		}