Merge pull request #48 from zhuyongyong/demoExpress-embedding/update6…

…samples [demoexpress-embedding] Update sample-embedding in demo-express
crosswalk-project · Feb 13, 2015 · aa5283c · aa5283c
2 parents 462901d + a4db340
commit aa5283c
Show file tree

Hide file tree

Showing 20 changed files with 194 additions and 104 deletions.
diff --git a/samples-embedding/AndroidManifest.xml b/samples-embedding/AndroidManifest.xml
@@ -14,7 +14,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/samples-embedding/assets/css/page.css b/samples-embedding/assets/css/page.css
@@ -0,0 +1 @@
+body{ font-size:40px;}
diff --git a/samples-embedding/assets/echo.html b/samples-embedding/assets/echo.html
@@ -1,26 +1,32 @@
 <html>
 <head>
 <title></title>
+<link rel="stylesheet" type="text/css" href="css/page.css">
 </head>
 <body>
+ Extension Page: This page shows the feedback message from extension and the execution result.<br/><br/><br/>
+<br/><br/>
 <script>
+
 try {
   var d = new Date().toString();
   echo.echo(d, function(msg) {
-    document.write(msg + "<br>");
+    document.write("<br/><font size=40>" + msg + "</font><br/>");
     var expected = "From java:" + d;
     if (msg === expected) {
-      document.write("Async echo <font color=green>passed</font>.");
+      document.write("<br/><font size=40>Async echo <font color=green>passed</font></font>");
       document.title = "Pass";
     } else {
-      document.write("Async echo <font color=red>failed</font>.");
+      document.write("<br/><font size=40>Async echo <font color=red>failed</font></font>");
       document.title = "Fail";
     }
   });
 } catch(e) {
   console.log(e);
   document.title = "Fail";
+  document.write("<br/><font size=40>Async echo <font color=red>failed</font></font>");
 }
+
 </script>
 </body>
 </html>
diff --git a/samples-embedding/assets/manifest.json b/samples-embedding/assets/manifest.json
@@ -2,7 +2,7 @@
   "name": "OnlineTest",
   "app": {
     "launch": {
-      "local_path": "index.html"
+      "local_path": "page3.html"
     }
   },
   "description": "Manifest test",

diff --git a/samples-embedding/assets/manifest_pause_timers.json b/samples-embedding/assets/manifest_pause_timers.json
diff --git a/samples-embedding/assets/navigate.html b/samples-embedding/assets/navigate.html
@@ -0,0 +1,18 @@
+<html>
+<head>
+<title>Navigate Page</title>
+<style type="text/css">
+  body{ font-size:30px;}
+</style>
+</head>
+<body>
+  <br/>
+  <ul>
+    <li>Click "Link To Clock Page" to go to a clock page.</li>
+    <li>Click prev button to navigate to the prev page.</li>
+    <li>Click next button to navigate to the next page.</li>
+  </ul>
+  <br/>
+  <a id="create_window_a_top" href="timers.html" target="_top">Link To Clock Page</a>
+</body>
+</html>
diff --git a/samples-embedding/assets/page1.html b/samples-embedding/assets/page1.html
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="css/page.css">
+  </head>
+  <body bgcolor="red">
+    <p>Page1: This page is loaded from page1.html.</p><br/><br/>
+    <p><b>Page 1</b></p>
+  </body>
+</html>
diff --git a/samples-embedding/assets/page2.html b/samples-embedding/assets/page2.html
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="css/page.css">
+  </head>
+  <body bgcolor="green">
+    Page2: This page is loaded from page2.html.<br/><br/><br/>
+    <p><b>Page 2</b></p>
+  </body>
+</html>
diff --git a/samples-embedding/assets/page3.html b/samples-embedding/assets/page3.html
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="css/page.css">
+  </head>
+  <body bgcolor="blue">
+    Page3: This page is loaded as app from manifest.<br/><br/><br/>
+    <p><b>Page 3</b></p>
+  </body>
+</html>
diff --git a/samples-embedding/assets/pause_timers.html b/samples-embedding/assets/pause_timers.html
diff --git a/samples-embedding/assets/timers.html b/samples-embedding/assets/timers.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Clock Page</title>
+<style type="text/css">
+  body{ font-size:30px;}
+</style>
+</head>
+<body>
+  <br/>
+  <ul>
+    <li>Click pause/resume button to pause/resume this clock.</li>
+    <li>Click "Run Animation" button to scaled down or scaled up the page view.</li>
+    <li>Click prev button to navigate to the prev page.</li>
+    <li>Click next button to navigate to the next page.</li>
+  </ul>
+  <br/>
+  <p>A script on this page starts this clock:</p>
+  <h1><p id="demo"></p></h1>
+
+<script>
+  var myVar=setInterval(function(){myTimer()},1000);
+
+  function myTimer()
+  {
+    var d=new Date();
+    var t=d.toLocaleTimeString();
+    document.getElementById("demo").innerHTML=t;
+  }
+</script>
+
+</body>
+</html>
diff --git a/samples-embedding/assets/window_navigate.html b/samples-embedding/assets/window_navigate.html
diff --git a/samples-embedding/res/layout/multi_texture_views.xml b/samples-embedding/res/layout/multi_texture_views.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2014 Intel Corporation. All rights reserved.
+
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/multi_texture_views"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_weight="2"
+    android:orientation="vertical" >
+  <TextView  
+    android:id="@+id/multiViews_des"  
+    android:layout_width="match_parent"  
+    android:layout_height="match_parent"/>
+  <LinearLayout
+        android:id="@+id/toolbar2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+    <Button android:id="@+id/run_resize"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="end"
+      android:text="Resize"/>
+  </LinearLayout>
+  <RelativeLayout
+    android:id="@+id/root_views"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_weight="2"
+    android:orientation="vertical" >
+
+  </RelativeLayout>  
+</RelativeLayout>
diff --git a/samples-embedding/res/layout/xwview_layout.xml b/samples-embedding/res/layout/xwview_layout.xml
@@ -13,19 +13,19 @@
             android:layout_width="wrap_content"  
             android:layout_height="wrap_content"/>
 
-     <TextView  
+     <TextView
             android:id="@+id/text1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="#FDF5E6" /> 
 
-     <TextView  
+     <TextView
             android:id="@+id/text2"  
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="#FDF5E6" /> 
 
-     <TextView  
+     <TextView
             android:id="@+id/text3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

diff --git a/samples-embedding/src/sample/ExtensionActivity.java b/samples-embedding/src/sample/ExtensionActivity.java
@@ -7,9 +7,7 @@
 import org.xwalk.embedded.api.sample.ExtensionEcho;
 import org.xwalk.core.XWalkView;
 
-import android.app.AlertDialog;
 import android.os.Bundle;
-import android.widget.Button;
 import android.widget.TextView;
 
 public class ExtensionActivity extends XWalkBaseActivity {
@@ -27,11 +25,13 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.xwview_extension_layout);
 
         textDes = (TextView) super.findViewById(R.id.extension_des);
-        textDes.setText("This sample is designed for extension feature. If the extension give a correct feedback, this page will contains 'passed' in green color.");
+        textDes.setText("This sample is designed for extension feature. " +
+        		"If the extension give a correct feedback, this page will show the" +
+        		" feedback message from extension and contain 'passed' in green color.");
 
         mExtension = new ExtensionEcho();
         mXWalkView = (XWalkView) findViewById(R.id.xwalkview_extension);
-
+        mExtension.print();
         mXWalkView.load("file:///android_asset/echo.html", null);
     }
 }
diff --git a/samples-embedding/src/sample/ExtensionEcho.java b/samples-embedding/src/sample/ExtensionEcho.java
@@ -35,4 +35,8 @@ public void onMessage(int instanceID, String message) {
     public String onSyncMessage(int instanceID, String message) {
         return "From java sync:" + message;
     }
+
+    public void print() {
+        System.out.println("execute");
+    }
 }
diff --git a/samples-embedding/src/sample/MultiSurfaceViewsActivity.java b/samples-embedding/src/sample/MultiSurfaceViewsActivity.java
@@ -3,7 +3,6 @@
 import org.xwalk.core.XWalkPreferences;
 import org.xwalk.core.XWalkView;
 
-import android.app.AlertDialog;
 import android.os.Bundle;
 import android.webkit.WebView;
 import android.widget.RelativeLayout;
@@ -19,13 +18,16 @@ public void onCreate(Bundle savedInstanceState) {
         RelativeLayout root = new RelativeLayout(this);
 
         textDes = new TextView(this);
-        textDes.setText("This sample demonstrates Multiple SurfaceViews can be shown in order.");
+        textDes.setText("This sample demonstrates Multiple SurfaceViews can be shown" +
+        		" in order. A,B,C views are SurfaceViews, D,E,F views are WebViews, " +
+                "the sort order of A,B,C are the same with D,E,F when rotate or " +
+                "restore the screen.");
         root.addView(textDes);
 
         for (int i = 0; i < 3; i++) {
             XWalkView xWalkView = new XWalkView(this, this);
             xWalkView.setX(i * 100);
-            xWalkView.setY((i + 1) * 100);
+            xWalkView.setY(150 + i * 70);
             xWalkView.load(null, String.format("<html><head><meta name='viewport' content='width=device-width'/></head>"
                     + "<body style='background-color: %s;'><h1>%s</h1></body></html>", i % 2 == 0 ? "white" : "grey", i == 0 ? "A" : i == 1 ?  "B" : "C"));
             root.addView(xWalkView, 200, 200);
@@ -34,7 +36,7 @@ public void onCreate(Bundle savedInstanceState) {
         for (int i = 3; i < 6; i++) {
             WebView webView = new WebView(this);
             webView.setX(i * 100);
-            webView.setY((i + 1) * 100);
+            webView.setY(150 + i * 70);
             webView.loadData(String.format("<html><body style='background-color: %s'><h1>%s</h1></body></html>",
                     i % 2 == 0 ? "white" : "grey", i == 3 ? "D" : i == 4 ?  "E" : "F"), "text/html", "utf-8");
             root.addView(webView, 200, 200);