From 59ce96f6dd8a03b6e23a0a93791316a5b09f71b3 Mon Sep 17 00:00:00 2001 From: vng Date: Sat, 10 Nov 2012 01:40:41 +0300 Subject: [PATCH] [android] Change behavior of facebook/buy dialogs: never button in the middle and later button on the right. --- .../src/com/mapswithme/maps/MWMActivity.java | 20 +++++++++---------- .../com/mapswithme/maps/MWMApplication.java | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java index ee695df85a..f82564ab6f 100644 --- a/android/src/com/mapswithme/maps/MWMActivity.java +++ b/android/src/com/mapswithme/maps/MWMActivity.java @@ -332,16 +332,7 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService .setCancelable(false) .setMessage(getString(resMsg)) .setPositiveButton(getString(R.string.ok), okListener) - .setNeutralButton(getString(R.string.later), new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dlg, int which) - { - dlg.dismiss(); - mApplication.submitDialogResult(dlgID, MWMApplication.LATER); - } - }) - .setNegativeButton(getString(R.string.never), new DialogInterface.OnClickListener() + .setNeutralButton(getString(R.string.never), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dlg, int which) @@ -350,6 +341,15 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService mApplication.submitDialogResult(dlgID, MWMApplication.NEVER); } }) + .setNegativeButton(getString(R.string.later), new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dlg, int which) + { + dlg.dismiss(); + mApplication.submitDialogResult(dlgID, MWMApplication.LATER); + } + }) .create() .show(); } diff --git a/android/src/com/mapswithme/maps/MWMApplication.java b/android/src/com/mapswithme/maps/MWMApplication.java index 0d53e3f786..285270eb22 100644 --- a/android/src/com/mapswithme/maps/MWMApplication.java +++ b/android/src/com/mapswithme/maps/MWMApplication.java @@ -194,7 +194,6 @@ public class MWMApplication extends android.app.Application implements MapStorag static public final int FACEBOOK = 0; static public final int BUYPRO = 1; public native boolean shouldShowDialog(int dlg); - /// values of result param should correspond to values defined in map/Framework.hpp static public final int OK = 0; static public final int LATER = 1;