diff --git a/modules/java/generator/src/java/android+BaseLoaderCallback.java b/modules/java/generator/src/java/android+BaseLoaderCallback.java
index b2b8e17d21..2936b8a3f4 100644
--- a/modules/java/generator/src/java/android+BaseLoaderCallback.java
+++ b/modules/java/generator/src/java/android+BaseLoaderCallback.java
@@ -32,7 +32,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
                 RestartMessage.setTitle("App restart is required");
                 RestartMessage.setMessage("Application will be closed now. Start it when installation will be finished!");
                 RestartMessage.setCancelable(false); // This blocks the 'BACK' button
-                RestartMessage.setButton("OK", new OnClickListener() {
+                RestartMessage.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         mAppContext.finish();
                     }
@@ -48,7 +48,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
                 MarketErrorMessage.setTitle("OpenCV Manager");
                 MarketErrorMessage.setMessage("Package installation failed!");
                 MarketErrorMessage.setCancelable(false); // This blocks the 'BACK' button
-                MarketErrorMessage.setButton("OK", new OnClickListener() {
+                MarketErrorMessage.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         mAppContext.finish();
                     }
@@ -69,7 +69,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
                 IncomatibilityMessage.setTitle("OpenCV Manager");
                 IncomatibilityMessage.setMessage("OpenCV Manager service is incompatible with this app. Update it!");
                 IncomatibilityMessage.setCancelable(false); // This blocks the 'BACK' button
-                IncomatibilityMessage.setButton("OK", new OnClickListener() {
+                IncomatibilityMessage.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         mAppContext.finish();
                     }
@@ -84,7 +84,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
                 InitFailedDialog.setTitle("OpenCV error");
                 InitFailedDialog.setMessage("OpenCV was not initialised correctly. Application will be shut down");
                 InitFailedDialog.setCancelable(false); // This blocks the 'BACK' button
-                InitFailedDialog.setButton("OK", new OnClickListener() {
+                InitFailedDialog.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() {
 
                     public void onClick(DialogInterface dialog, int which) {
                         mAppContext.finish();
@@ -102,7 +102,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
         InstallMessage.setTitle("Package not found");
         InstallMessage.setMessage(callback.getPackageName() + " package was not found! Try to install it?");
         InstallMessage.setCancelable(false); // This blocks the 'BACK' button
-        InstallMessage.setButton("Yes", new OnClickListener()
+        InstallMessage.setButton(AlertDialog.BUTTON_POSITIVE, "Yes", new OnClickListener()
         {
             public void onClick(DialogInterface dialog, int which)
             {
@@ -110,7 +110,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
             }
         });
 
-        InstallMessage.setButton2("No", new OnClickListener() {
+        InstallMessage.setButton(AlertDialog.BUTTON_NEGATIVE, "No", new OnClickListener() {
 
             public void onClick(DialogInterface dialog, int which)
             {
diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java
index deae223760..7905192d8a 100644
--- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java
+++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java
@@ -36,7 +36,7 @@ public class puzzle15Activity extends Activity
 						AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
 						ad.setCancelable(false); // This blocks the 'BACK' button
 						ad.setMessage("Fatal error: can't open camera!");
-						ad.setButton("OK", new DialogInterface.OnClickListener() {
+						ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 						    public void onClick(DialogInterface dialog, int which) {
 							dialog.dismiss();
 							finish();
@@ -74,7 +74,7 @@ public class puzzle15Activity extends Activity
 			AlertDialog ad = new AlertDialog.Builder(this).create();
 			ad.setCancelable(false); // This blocks the 'BACK' button
 			ad.setMessage("Fatal error: can't open camera!");
-			ad.setButton("OK", new DialogInterface.OnClickListener() {
+			ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 			    public void onClick(DialogInterface dialog, int which) {
 				dialog.dismiss();
 				finish();
diff --git a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
index 5cdbdf220d..b959dd267b 100644
--- a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
+++ b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
@@ -31,7 +31,7 @@ public class ColorBlobDetectionActivity extends Activity {
 							AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
 							ad.setCancelable(false); // This blocks the 'BACK' button
 							ad.setMessage("Fatal error: can't open camera!");
-							ad.setButton("OK", new DialogInterface.OnClickListener() {
+							ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 							    public void onClick(DialogInterface dialog, int which) {
 								dialog.dismiss();
 								finish();
@@ -69,7 +69,7 @@ public class ColorBlobDetectionActivity extends Activity {
 			AlertDialog ad = new AlertDialog.Builder(this).create();
 			ad.setCancelable(false); // This blocks the 'BACK' button
 			ad.setMessage("Fatal error: can't open camera!");
-			ad.setButton("OK", new DialogInterface.OnClickListener() {
+			ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 			    public void onClick(DialogInterface dialog, int which) {
 				dialog.dismiss();
 				finish();
diff --git a/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java b/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java
index 72fb39637f..1577a0148d 100644
--- a/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java
+++ b/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java
@@ -45,7 +45,7 @@ public class FdActivity extends Activity {
 						AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
 						ad.setCancelable(false); // This blocks the 'BACK' button
 						ad.setMessage("Fatal error: can't open camera!");
-						ad.setButton("OK", new DialogInterface.OnClickListener() {
+						ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 						    public void onClick(DialogInterface dialog, int which) {
 							dialog.dismiss();
 							finish();
@@ -89,7 +89,7 @@ public class FdActivity extends Activity {
 			AlertDialog ad = new AlertDialog.Builder(this).create();  
 			ad.setCancelable(false); // This blocks the 'BACK' button  
 			ad.setMessage("Fatal error: can't open camera!");  
-			ad.setButton("OK", new DialogInterface.OnClickListener() {  
+			ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {  
 			    public void onClick(DialogInterface dialog, int which) {  
 			        dialog.dismiss();                      
 					finish();
diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
index d9d3ef1323..de71365c03 100644
--- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
+++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
@@ -54,7 +54,7 @@ public class ImageManipulationsActivity extends Activity {
 						AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
 						ad.setCancelable(false); // This blocks the 'BACK' button
 						ad.setMessage("Fatal error: can't open camera!");
-						ad.setButton("OK", new DialogInterface.OnClickListener() {
+						ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 						    public void onClick(DialogInterface dialog, int which) {
 							dialog.dismiss();
 							finish();
@@ -91,7 +91,7 @@ public class ImageManipulationsActivity extends Activity {
 			AlertDialog ad = new AlertDialog.Builder(this).create();  
 			ad.setCancelable(false); // This blocks the 'BACK' button  
 			ad.setMessage("Fatal error: can't open camera!");  
-			ad.setButton("OK", new DialogInterface.OnClickListener() {  
+			ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {  
 			    public void onClick(DialogInterface dialog, int which) {  
 			        dialog.dismiss();                      
 					finish();
diff --git a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java
index a52aba4050..a8b7765989 100644
--- a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java
+++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java
@@ -36,7 +36,7 @@ public class Sample0Base extends Activity {
 			AlertDialog ad = new AlertDialog.Builder(this).create();  
 			ad.setCancelable(false); // This blocks the 'BACK' button  
 			ad.setMessage("Fatal error: can't open camera!");  
-			ad.setButton("OK", new DialogInterface.OnClickListener() {  
+			ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {  
 			    public void onClick(DialogInterface dialog, int which) {  
 				dialog.dismiss();
 				finish();
diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
index e316021f33..7581639a62 100644
--- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
+++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
@@ -36,7 +36,7 @@ public class Sample1Java extends Activity {
 						AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
 						ad.setCancelable(false); // This blocks the 'BACK' button
 						ad.setMessage("Fatal error: can't open camera!");
-						ad.setButton("OK", new DialogInterface.OnClickListener() {
+						ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 						    public void onClick(DialogInterface dialog, int which) {
 							dialog.dismiss();
 							finish();
@@ -73,7 +73,7 @@ public class Sample1Java extends Activity {
 			AlertDialog ad = new AlertDialog.Builder(this).create();  
 			ad.setCancelable(false); // This blocks the 'BACK' button  
 			ad.setMessage("Fatal error: can't open camera!");  
-			ad.setButton("OK", new DialogInterface.OnClickListener() {  
+			ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {  
 			    public void onClick(DialogInterface dialog, int which) {  
 				dialog.dismiss();
 				finish();
diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
index e81d1c09cb..13437d73db 100644
--- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
+++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
@@ -43,7 +43,7 @@ public class Sample2NativeCamera extends Activity {
 						AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
 						ad.setCancelable(false); // This blocks the 'BACK' button
 						ad.setMessage("Fatal error: can't open camera!");
-						ad.setButton("OK", new DialogInterface.OnClickListener() {
+						ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 						    public void onClick(DialogInterface dialog, int which) {
 							dialog.dismiss();
 							finish();
@@ -80,7 +80,7 @@ public class Sample2NativeCamera extends Activity {
 			AlertDialog ad = new AlertDialog.Builder(this).create();  
 			ad.setCancelable(false); // This blocks the 'BACK' button  
 			ad.setMessage("Fatal error: can't open camera!");  
-			ad.setButton("OK", new DialogInterface.OnClickListener() {  
+			ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {  
 			    public void onClick(DialogInterface dialog, int which) {  
 			        dialog.dismiss();
 					finish();
diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
index fa53eba83c..f4d9bf7906 100644
--- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
+++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
@@ -34,7 +34,7 @@ public class Sample3Native extends Activity {
 						AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
 						ad.setCancelable(false); // This blocks the 'BACK' button
 						ad.setMessage("Fatal error: can't open camera!");
-						ad.setButton("OK", new DialogInterface.OnClickListener() {
+						ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 						    public void onClick(DialogInterface dialog, int which) {
 							dialog.dismiss();
 							finish();
@@ -71,7 +71,7 @@ public class Sample3Native extends Activity {
 			AlertDialog ad = new AlertDialog.Builder(this).create();  
 			ad.setCancelable(false); // This blocks the 'BACK' button  
 			ad.setMessage("Fatal error: can't open camera!");  
-			ad.setButton("OK", new DialogInterface.OnClickListener() {  
+			ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {  
 			    public void onClick(DialogInterface dialog, int which) {  
 				dialog.dismiss();
 				finish();
diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
index 6a85abc31f..2ea0fe1c34 100644
--- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
+++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
@@ -42,7 +42,7 @@ public class Sample4Mixed extends Activity {
 						AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
 						ad.setCancelable(false); // This blocks the 'BACK' button
 						ad.setMessage("Fatal error: can't open camera!");
-						ad.setButton("OK", new DialogInterface.OnClickListener() {
+						ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
 						    public void onClick(DialogInterface dialog, int which) {
 							dialog.dismiss();
 							finish();
@@ -79,7 +79,7 @@ public class Sample4Mixed extends Activity {
 			AlertDialog ad = new AlertDialog.Builder(this).create();  
 			ad.setCancelable(false); // This blocks the 'BACK' button  
 			ad.setMessage("Fatal error: can't open camera!");  
-			ad.setButton("OK", new DialogInterface.OnClickListener() {  
+			ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {  
 			    public void onClick(DialogInterface dialog, int which) {  
 			        dialog.dismiss();                      
 					finish();