Android: Implemented Pixmap drawing, also much cleanup in Fl_Android_Graphics_Driver.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12810 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 3 insertions, 111 deletions

diff --git a/ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx b/ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx
index b2be477cd..38f5f551b 100644
--- a/ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx
+++ b/ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx
@@ -18,116 +18,8 @@
 #if 0
 
 
-#include <FL/Fl.H>
-#include <FL/Fl_Window.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Hor_Slider.H>
-#include <FL/fl_draw.H>
-
-class MyBox : public Fl_Box
-{
-public:
-  MyBox(int x, int y, int w, int h) :
-    Fl_Box(x, y, w, h)
-  {
-    box(FL_DOWN_BOX);
-  }
-  void draw()
-  {
-    Fl_Box::draw();
-    fl_color(FL_BLUE);
-    fl_pie(x()+20, y()+20, w()-40, h()-40, a1, a2);
-  }
-  double a1 = 0.0;
-  double a2 = 240.0;
-};
-
-Fl_Window *win;
-MyBox *box = 0L;
-char s1Label[80] = { 0 };
-char s2Label[80] = { 0 };
-
-int main(int argc, char **argv)
-{
-  win = new Fl_Window(0, 0, 600, 800);
-
-  box = new MyBox(10, 10, 580, 580);
-
-  auto s1 = new Fl_Hor_Slider(210, 600, 380, 45, s1Label);
-  s1->range(-360, 360);
-  s1->value(0.0);
-  s1->labelsize(35);
-  s1->align(FL_ALIGN_LEFT);
-  s1->increment(1, 0);
-  s1->callback(
-    [](Fl_Widget *w, void*) {
-      auto s = (Fl_Slider*)w;
-      box->a1 = s->value();
-      sprintf(s1Label, "%g", s->value());
-      win->redraw();
-    }
-  );
-
-  auto s2 = new Fl_Hor_Slider(210, 660, 380, 45, s2Label);
-  s2->range(-360, 360);
-  s2->value(240.0);
-  s2->labelsize(35);
-  s2->align(FL_ALIGN_LEFT);
-  s2->callback(
-          [](Fl_Widget *w, void*) {
-            auto s = (Fl_Slider*)w;
-            box->a2 = s->value();
-            sprintf(s2Label, "%g", s->value());
-            win->redraw();
-          }
-  );
-
-  win->show(argc, argv);
-  Fl::run();
-  return 0;
-}
-
 #elif 1
 
-#include <stdlib.h>
-#include <FL/Fl.H>
-#include <FL/Fl_Double_Window.H>
-#include <FL/Fl_Adjuster.H>
-#include <FL/Fl_Box.H>
-
-void adjcb(Fl_Widget *o, void *v) {
-  Fl_Adjuster *a = (Fl_Adjuster*)o;
-  Fl_Box *b = (Fl_Box *)v;
-  a->format((char *)(b->label()));
-  b->redraw();
-}
-
-int main(int argc, char ** argv) {
-  Fl_Double_Window window(320,100,argv[0]);
-
-  char buf1[100];
-  Fl_Box b1(FL_DOWN_BOX,20,30,80,25,buf1);
-  b1.color(FL_WHITE);
-  Fl_Adjuster a1(20+80,30,3*25,25);
-  a1.callback(adjcb,&b1);
-  adjcb(&a1,&b1);
-
-  char buf2[100];
-  Fl_Box b2(FL_DOWN_BOX,20+80+4*25,30,80,25,buf2);
-  b2.color(FL_WHITE);
-  Fl_Adjuster a2(b2.x()+b2.w(),10,25,3*25);
-  a2.callback(adjcb,&b2);
-  adjcb(&a2,&b2);
-
-  window.resizable(window);
-  window.end();
-  window.show(argc, argv);
-  return Fl::run();
-}
-
-
-#elif 0
-
 
 #include <FL/Fl.H>
 #include <FL/Fl_Double_Window.H>
diff --git a/ide/AndroidStudio3/build.gradle b/ide/AndroidStudio3/build.gradle
index a4ea174d3..3fe555653 100644
--- a/ide/AndroidStudio3/build.gradle
+++ b/ide/AndroidStudio3/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
     }
 }
 
diff --git a/ide/AndroidStudio3/gradle/wrapper/gradle-wrapper.properties b/ide/AndroidStudio3/gradle/wrapper/gradle-wrapper.properties
index a851373bd..4b6124daa 100644
--- a/ide/AndroidStudio3/gradle/wrapper/gradle-wrapper.properties
+++ b/ide/AndroidStudio3/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Feb 05 20:05:03 IST 2017
+#Tue Mar 27 23:05:16 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip