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

Remove all dialog icons in Settings

Browse Source 
BUG: 15474733
Change-Id: I43ab10a3bbcabdac6109abf80266f1c4b52bf6fb
This commit is contained in:
Alan Viverette
2014-06-10 13:41:07 -07:00
parent a29f3bbff4
commit 6bfec2d6b1
17 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/CredentialStorage.java
View File

@@ -270,7 +270,6 @@ public final class CredentialStorage extends Activity {
private ResetDialog() {
AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
.setTitle(android.R.string.dialog_alert_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(R.string.credentials_reset_hint)
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this)
@@ -340,7 +339,6 @@ public final class CredentialStorage extends Activity {
private ConfigureKeyGuardDialog() {
AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
.setTitle(android.R.string.dialog_alert_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(R.string.credentials_configure_lock_screen_hint)
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this)

1
src/com/android/settings/CryptKeeperSettings.java
View File

@@ -87,7 +87,6 @@ public class CryptKeeperSettings extends Fragment {
// TODO replace (or follow) this dialog with an explicit launch into password UI
new AlertDialog.Builder(getActivity())
.setTitle(R.string.crypt_keeper_dialog_need_password_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(R.string.crypt_keeper_dialog_need_password_message)
.setPositiveButton(android.R.string.ok, null)
.create()

2
src/com/android/settings/DevelopmentSettings.java
View File

@@ -1236,7 +1236,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
getActivity().getResources().getString(
R.string.dev_settings_warning_message))
.setTitle(R.string.dev_settings_warning_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.no, this)
.show();
@@ -1277,7 +1276,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
mAdbDialog = new AlertDialog.Builder(getActivity()).setMessage(
getActivity().getResources().getString(R.string.adb_warning_message))
.setTitle(R.string.adb_warning_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.no, this)
.show();

1
src/com/android/settings/PrivacySettings.java
View File

@@ -119,7 +119,6 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
// TODO: DialogFragment?
mConfirmDialog = new AlertDialog.Builder(getActivity()).setMessage(msg)
.setTitle(R.string.backup_erase_dialog_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this)
.show();

2
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

@@ -163,7 +163,6 @@ public class ToggleAccessibilityServicePreferenceFragment
AlertDialog ad = new AlertDialog.Builder(getActivity())
.setTitle(getString(R.string.enable_service_title,
info.getResolveInfo().loadLabel(getPackageManager())))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setView(createEnableDialogContentView(info))
.setCancelable(true)
.setPositiveButton(android.R.string.ok, this)
@@ -182,7 +181,6 @@ public class ToggleAccessibilityServicePreferenceFragment
return new AlertDialog.Builder(getActivity())
.setTitle(getString(R.string.disable_service_title,
info.getResolveInfo().loadLabel(getPackageManager())))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getString(R.string.disable_service_message,
info.getResolveInfo().loadLabel(getPackageManager())))
.setCancelable(true)

9
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -1109,7 +1109,6 @@ public class InstalledAppDetails extends Fragment
case DLG_CLEAR_DATA:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.clear_data_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.clear_data_dlg_text))
.setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {
@@ -1123,7 +1122,6 @@ public class InstalledAppDetails extends Fragment
case DLG_FACTORY_RESET:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_factory_reset_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.app_factory_reset_dlg_text))
.setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {
@@ -1138,7 +1136,6 @@ public class InstalledAppDetails extends Fragment
case DLG_APP_NOT_FOUND:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_not_found_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.app_not_found_dlg_title))
.setNeutralButton(getActivity().getText(R.string.dlg_ok),
new DialogInterface.OnClickListener() {
@@ -1151,7 +1148,6 @@ public class InstalledAppDetails extends Fragment
case DLG_CANNOT_CLEAR_DATA:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.clear_failed_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.clear_failed_dlg_text))
.setNeutralButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {
@@ -1165,7 +1161,6 @@ public class InstalledAppDetails extends Fragment
case DLG_FORCE_STOP:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.force_stop_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.force_stop_dlg_text))
.setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {
@@ -1181,14 +1176,12 @@ public class InstalledAppDetails extends Fragment
getOwner().getMoveErrMsg(moveErrorCode));
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.move_app_failed_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(msg)
.setNeutralButton(R.string.dlg_ok, null)
.create();
case DLG_DISABLE:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_disable_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.app_disable_dlg_text))
.setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {
@@ -1204,7 +1197,6 @@ public class InstalledAppDetails extends Fragment
case DLG_DISABLE_NOTIFICATIONS:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_disable_notifications_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.app_disable_notifications_dlg_text))
.setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {
@@ -1224,7 +1216,6 @@ public class InstalledAppDetails extends Fragment
case DLG_SPECIAL_DISABLE:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_special_disable_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.app_special_disable_dlg_text))
.setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {

1
src/com/android/settings/applications/RunningServiceDetails.java
View File

@@ -583,7 +583,6 @@ public class RunningServiceDetails extends Fragment
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getString(R.string.runningservicedetails_stop_dlg_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getString(R.string.runningservicedetails_stop_dlg_text))
.setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {

1
src/com/android/settings/bluetooth/Utils.java
View File

@@ -93,7 +93,6 @@ final class Utils {
Context activity = manager.getForegroundActivity();
if(manager.isForegroundActivity()) {
new AlertDialog.Builder(activity)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.bluetooth_error_title)
.setMessage(message)
.setPositiveButton(android.R.string.ok, null)

1
src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
View File

@@ -166,7 +166,6 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
if (mDialog == null) {
mDialog = (new AlertDialog.Builder(getActivity()))
.setTitle(android.R.string.dialog_alert_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setCancelable(true)
.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {

1
src/com/android/settings/inputmethod/InputMethodPreference.java
View File

@@ -265,7 +265,6 @@ public class InputMethodPreference extends CheckBoxPreference {
}
mDialog = (new AlertDialog.Builder(mFragment.getActivity()))
.setTitle(android.R.string.dialog_alert_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setCancelable(true)
.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {

1
src/com/android/settings/inputmethod/SpellCheckersSettings.java
View File

@@ -122,7 +122,6 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment
}
mDialog = (new AlertDialog.Builder(getActivity()))
.setTitle(android.R.string.dialog_alert_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setCancelable(true)
.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {

1
src/com/android/settings/notification/ManagedServiceSettings.java
View File

@@ -106,7 +106,6 @@ public abstract class ManagedServiceSettings extends ListFragment {
return new AlertDialog.Builder(getActivity())
.setMessage(summary)
.setTitle(title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setCancelable(true)
.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {

1
src/com/android/settings/print/PrintServiceSettingsFragment.java
View File

@@ -195,7 +195,6 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
}
return new AlertDialog.Builder(getActivity())
.setTitle(title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(message)
.setCancelable(true)
.setPositiveButton(android.R.string.ok, this)

1
src/com/android/settings/quicklaunch/QuickLaunchSettings.java
View File

@@ -153,7 +153,6 @@ public class QuickLaunchSettings extends SettingsPreferenceFragment implements
// Create the dialog for clearing a shortcut
return new AlertDialog.Builder(getActivity())
.setTitle(getString(R.string.quick_launch_clear_dialog_title))
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getString(R.string.quick_launch_clear_dialog_message,
mClearDialogShortcut, mClearDialogBookmarkTitle))
.setPositiveButton(R.string.quick_launch_clear_ok_button, this)

9
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -478,11 +478,10 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
private void displayNetworkAlert() {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(android.R.string.dialog_alert_title);
builder.setIconAttribute(android.R.attr.alertDialogIcon);
builder.setMessage(getActivity().getString(R.string.tts_engine_network_required));
builder.setCancelable(false);
builder.setPositiveButton(android.R.string.ok, null);
builder.setTitle(android.R.string.dialog_alert_title)
.setMessage(getActivity().getString(R.string.tts_engine_network_required))
.setCancelable(false)
.setPositiveButton(android.R.string.ok, null);
AlertDialog dialog = builder.create();
dialog.show();

13
src/com/android/settings/tts/TtsEnginePreference.java
View File

@@ -198,13 +198,12 @@ public class TtsEnginePreference extends Preference {
Log.i(TAG, "Displaying data alert for :" + mEngineInfo.name);
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setTitle(android.R.string.dialog_alert_title);
builder.setIconAttribute(android.R.attr.alertDialogIcon);
builder.setMessage(getContext().getString(
R.string.tts_engine_security_warning, mEngineInfo.label));
builder.setCancelable(true);
builder.setPositiveButton(android.R.string.ok, positiveOnClickListener);
builder.setNegativeButton(android.R.string.cancel, negativeOnClickListener);
builder.setTitle(android.R.string.dialog_alert_title)
.setMessage(getContext().getString(
R.string.tts_engine_security_warning, mEngineInfo.label))
.setCancelable(true)
.setPositiveButton(android.R.string.ok, positiveOnClickListener)
.setNegativeButton(android.R.string.cancel, negativeOnClickListener);
AlertDialog dialog = builder.create();
dialog.show();

1
src/com/android/settings/users/RestrictedProfileSettings.java
View File

@@ -202,7 +202,6 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment {
mEditUserInfoDialog = new AlertDialog.Builder(getActivity())
.setTitle(R.string.profile_info_settings_title)
.setIconAttribute(R.drawable.ic_settings_multiuser)
.setView(content)
.setCancelable(true)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {