Initial commit of our new Android app to demo Skia.

tools/viewer/sk_app/android/Window_android.h

Index: tools/viewer/sk_app/android/Window_android.h
diff --git a/tools/viewer/sk_app/android/Window_android.h b/tools/viewer/sk_app/android/Window_android.h
index d41f0a54c2a6f2c1c2bf42663107acc2a47cb7bd..aae67cbf1fdb365eeec634fd6ab8928675216cfd 100644
--- a/tools/viewer/sk_app/android/Window_android.h
+++ b/tools/viewer/sk_app/android/Window_android.h
@@ -9,29 +9,23 @@
 #define Window_android_DEFINED
 
 #include "../Window.h"
-#include <android_native_app_glue.h>
+#include "surface_glue_android.h"
 
 namespace sk_app {
 
-enum {
-    /**
-     * Leave plenty of space between this item and the ones defined in the glue layer
-     */
-    APP_CMD_INVAL_WINDOW = 64,
-};
-
 class Window_android : public Window {
 public:
     Window_android() : Window() {}
     ~Window_android() override {}
 
-    bool init(android_app* app_state);
+    bool init(SkiaAndroidApp* skiaAndroidApp);
     void initDisplay(ANativeWindow* window);
+    void onDisplayDestroyed();
 
     void setTitle(const char*) override;
     void show() override {}
 
-    bool attach(BackEndType attachType, int msaaSampleCount, bool deepColor) override;
+    bool attach(BackEndType attachType, int msaaSampleCount) override;
     void inval() override;
 
     void paintIfNeeded();

[djsollen, 2016/05/09 13:17:14]

remove this method.

[liyuqian, 2016/05/09 14:27:27]

Done.

@@ -42,9 +36,10 @@ public:
     void setContentRect(int l, int t, int r, int b) { mContentRect.set(l,t,r,b); }
 
 private:
-    android_app* mApp = nullptr;
+    SkiaAndroidApp* fSkiaAndroidApp = nullptr;
     SkRect mContentRect;

[djsollen, 2016/05/09 13:17:14]

fContentRect and fSampleCount

[liyuqian, 2016/05/09 14:27:27]

Done.

     int mSampleCount = 0;
+    bool fNativeWindowInitialized = false;

[djsollen, 2016/05/09 13:17:14]

make this a field on SkiaAndroidApp

[liyuqian, 2016/05/09 14:27:27]

This field is no longer needed as we moved paintIfNeeded to SkiaAndroidApp. It's
sufficient to check that fNativeWindow exists.

 };
 
 }   // namespace sk_app