fullShow now without flicker.

rjmatthews62 · rjmatthews62 · commit 52c0fad7fee6 · 2012-06-02T17:28:01.000+10:00
diff --git a/android/Common/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java b/android/Common/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java
@@ -168,6 +168,24 @@ public void onClick(View view) {
     mEventFacade.postEvent("click", mInflater.getViewInfo(view));
   }
 
+  public void loadLayout(String layout) {
+    ViewInflater inflater = new ViewInflater();
+    View view;
+    StringReader sr = new StringReader(layout);
+    try {
+      XmlPullParser xml = ViewInflater.getXml(sr);
+      view = inflater.inflate(getActivity(), xml);
+      mView = view;
+      mInflater = inflater;
+      getActivity().setContentView(mView);
+      mInflater.setClickListener(mView, this, this);
+      mLayout = layout;
+      mView.invalidate();
+    } catch (Exception e) {
+      mInflater.getErrors().add(e.toString());
+    }
+  }
+
   private class SetProperty implements Runnable {
     View mView;
     String mProperty;
@@ -207,6 +225,21 @@ public void run() {
     }
   }
 
+  private class SetLayout implements Runnable {
+    String mLayout;
+    CountDownLatch mLatch = new CountDownLatch(1);
+
+    SetLayout(String layout) {
+      mLayout = layout;
+    }
+
+    @Override
+    public void run() {
+      loadLayout(mLayout);
+      mLatch.countDown();
+    }
+  }
+
   @Override
   public boolean onKeyDown(int keyCode, KeyEvent event) {
     Map<String, String> data = new HashMap<String, String>();
@@ -235,4 +268,15 @@ public void setOverrideKeys(List<Integer> overrideKeys) {
     mOverrideKeys = overrideKeys;
   }
 
+  // Used to hot-switch screens.
+  public void setLayout(String layout) {
+    SetLayout p = new SetLayout(layout);
+    mHandler.post(p);
+    try {
+      p.mLatch.await();
+    } catch (InterruptedException e) {
+      mInflater.getErrors().add(e.toString());
+    }
+  }
+
 }
diff --git a/android/Common/src/com/googlecode/android_scripting/facade/ui/UiFacade.java b/android/Common/src/com/googlecode/android_scripting/facade/ui/UiFacade.java
@@ -552,14 +552,16 @@ public List<String> fullShow(
       @RpcParameter(name = "layout", description = "String containing View layout") String layout)
       throws InterruptedException {
     if (mFullScreenTask != null) {
-      fullDismiss();
+      // fullDismiss();
+      mFullScreenTask.setLayout(layout);
+    } else {
+      mFullScreenTask = new FullScreenTask(layout);
+      mFullScreenTask.setEventFacade(mEventFacade);
+      mFullScreenTask.setUiFacade(this);
+      mFullScreenTask.setOverrideKeys(mOverrideKeys);
+      mTaskQueue.execute(mFullScreenTask);
+      mFullScreenTask.getShowLatch().await();
     }
-    mFullScreenTask = new FullScreenTask(layout);
-    mFullScreenTask.setEventFacade(mEventFacade);
-    mFullScreenTask.setUiFacade(this);
-    mFullScreenTask.setOverrideKeys(mOverrideKeys);
-    mTaskQueue.execute(mFullScreenTask);
-    mFullScreenTask.getShowLatch().await();
     return mFullScreenTask.mInflater.getErrors();
   }
 
diff --git a/android/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java b/android/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
@@ -997,4 +997,10 @@ public void setListAdapter(View view, JSONArray items) {
       mErrors.add("failed to load list " + e.getMessage());
     }
   }
+
+  public void clearAll() {
+    getErrors().clear();
+    mIdList.clear();
+    mNextSeq = BASESEQ;
+  }
 }
diff --git a/android/ScriptForAndroidTemplate/libs/script.jar b/android/ScriptForAndroidTemplate/libs/script.jar
diff --git a/android/ScriptingLayerForAndroid/AndroidManifest.xml b/android/ScriptingLayerForAndroid/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.googlecode.android_scripting" android:installLocation="auto"
-	android:versionCode="518" android:versionName="5x18">
+	android:versionCode="519" android:versionName="5x19">
 	<uses-permission android:name="android.permission.RECEIVE_SMS" />
 	<uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
 	<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
diff --git a/android/script_for_android_template.zip b/android/script_for_android_template.zip

Original file line number	Diff line number	Diff line change
`@@ -997,4 +997,10 @@ public void setListAdapter(View view, JSONArray items) {`
`997`	`997`	`mErrors.add("failed to load list " + e.getMessage());`
`998`	`998`	`}`
`999`	`999`	`}`
	`1000`	`+`
	`1001`	`+ public void clearAll() {`
	`1002`	`+ getErrors().clear();`
	`1003`	`+ mIdList.clear();`
	`1004`	`+ mNextSeq = BASESEQ;`
	`1005`	`+ }`
`1000`	`1006`	`}`