Initial commit of our new Android app to demo Skia.

tools/viewer/sk_app/android/Window_android.h

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #ifndef Window_android_DEFINED
 #define Window_android_DEFINED
 
+#include <android_native_app_glue.h>

[djsollen, 2016/05/06 18:45:26]

remove this and all references to android_app*

[liyuqian, 2016/05/06 20:42:30]

Done.

 #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,

[djsollen, 2016/05/06 18:45:26]

make this on of the MessageTypes in the surface glue.

[liyuqian, 2016/05/06 20:42:30]

Done.

 };
 
 class Window_android : public Window {
 public:
     Window_android() : Window() {}
     ~Window_android() override {}
 
     bool init(android_app* app_state);
+    bool init(AppThread* appThread);
     void initDisplay(ANativeWindow* window);
 
     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();
 
     bool scaleContentToFit() const override { return true; }
     bool supportsContentRect() const override { return true; }
     SkRect getContentRect() override { return mContentRect; }
     void setContentRect(int l, int t, int r, int b) { mContentRect.set(l,t,r,b); }
 
 private:
     android_app* mApp = nullptr;
+    AppThread* mAppThread = nullptr;
     SkRect mContentRect;
     int mSampleCount = 0;
+    bool nativeWindowInitialized = false;

[jvanverth1, 2016/05/06 17:02:07]

We start member variables with 'f', so this should be fNativeWindowInitialized.
The others above it should be changed, too (which may be my fault).

[liyuqian, 2016/05/06 20:42:30]

Done.

 };
 
 }   // namespace sk_app
 
 #endif