Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(626)

Unified Diff: sky/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java

Issue 1213203008: Make it possible to load Sky demos from local bundles (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: re-upload Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sky/apk/demo/org/domokit/sky/demo/SkyDemoApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
diff --git a/sky/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java b/sky/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
index 0fff47c115ec2c9ba7f360379ed5c8aaa52a17e0..cbc4abb260e10654a7f895451bcb030c55103609 100644
--- a/sky/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
+++ b/sky/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
@@ -21,8 +21,18 @@ public class SkyDemoActivity extends SkyActivity {
if (Intent.ACTION_MAIN.equals(action)) {
loadUrl(DEFAULT_URL);
- } else if (Intent.ACTION_VIEW.equals(action)) {
+ return;
+ }
+
+ if (Intent.ACTION_VIEW.equals(action)) {
+ String bundleName = intent.getStringExtra("bundleName");
+ if (bundleName != null && loadBundleByName(bundleName)) {
+ return;
+ }
loadUrl(intent.getDataString());
+ return;
}
+
+ super.onSkyReady();
}
}
« no previous file with comments | « no previous file | sky/apk/demo/org/domokit/sky/demo/SkyDemoApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698