diff options
| author | Andy Doan <andy.doan@linaro.org> | 2011-10-25 14:29:37 -0500 |
|---|---|---|
| committer | Andy Doan <andy.doan@linaro.org> | 2011-10-25 14:29:37 -0500 |
| commit | 121226a8545dc77279cec85e97e51e72e5c7400a (patch) | |
| tree | 63ef0a3df34ec67b69cefc530c6b89ce3140eb34 | |
| parent | 419dff2c4d1b7f586970f92c692e1dd9b570db42 (diff) | |
| download | LinaroConnect-121226a8545dc77279cec85e97e51e72e5c7400a.tar.gz | |
move to version 3v1.02
this includes a new layout to better show the schedule
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/raw/connect_layout.json | 24 | ||||
| -rw-r--r-- | src/org/linaro/connect/LinaroConnectActivity.java | 2 |
3 files changed, 20 insertions, 10 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 29255bb..a1027ed 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.linaro.connect" - android:versionCode="2" - android:versionName="1.01"> + android:versionCode="3" + android:versionName="1.02"> <uses-sdk android:minSdkVersion="8" /> <uses-permission android:name="android.permission.INTERNET"></uses-permission> diff --git a/res/raw/connect_layout.json b/res/raw/connect_layout.json index e332f42..5d27628 100644 --- a/res/raw/connect_layout.json +++ b/res/raw/connect_layout.json @@ -2,13 +2,13 @@ links: [ { "label": "Schedule", - "intent": "android.intent.action.VIEW", - "data": "http://summit.linaro.org/uds-p/track/linaro-summits" + "intent": "org.linaro.connect.LAYOUT", + "data": "http://people.linaro.org/~doanac/connect-schedule.json" }, { "label": "Hotel Layout", "intent": "android.intent.action.VIEW", - "data": "http://www.thecaribeorlando.com/uploadedImages/Meetings_And_Events/Caribe_Royale/Caribe_Property_Map.gif" + "data": "http://connect.linaro.org/wp-content/uploads/2011/10/connect-q411-hotel-layout.jpg" }, { "label": "Pictures", @@ -16,19 +16,29 @@ "data": "http://www.linaro.org/remote/twitpic.php" }, { - "label": "Google+", + "label": "Blogs", "intent": "org.linaro.connect.POSTINGS", - "data": "http://people.linaro.org/~doanac/connect-plus.json" + "data": "http://people.linaro.org/~doanac/connect-planet.json" + }, + { + "label": "Twitter", + "intent": "org.linaro.connect.POSTINGS", + "data": "http://people.linaro.org/~doanac/connect-twitter.json" }, { "label": "Social Events", - "intent": "android.intent.action.VIEW", - "data": "http://connect.linaro.org/events/event/linaro-connect-q411/#socializing" + "intent": "org.linaro.connect.POSTINGS", + "data": "http://people.linaro.org/~doanac/connect-social-q411.json" }, { "label": "Connect Website", "intent": "android.intent.action.VIEW", "data": "http://connect.linaro.org/events/event/linaro-connect-q411/" }, + { + "label": "Register", + "intent": "android.intent.action.VIEW", + "data": "https://launchpad.net/sprints/lcq4.11" + }, ] } diff --git a/src/org/linaro/connect/LinaroConnectActivity.java b/src/org/linaro/connect/LinaroConnectActivity.java index 5ec4d24..06e0b85 100644 --- a/src/org/linaro/connect/LinaroConnectActivity.java +++ b/src/org/linaro/connect/LinaroConnectActivity.java @@ -19,7 +19,7 @@ import android.widget.ListView; public class LinaroConnectActivity extends Activity { - private final static String LAYOUT_URL = "http://people.linaro.org/~doanac/connect-layout.json"; + private final static String LAYOUT_URL = "http://people.linaro.org/~doanac/connect-layout-v3.json"; private static final int REFRESH_ID = Menu.FIRST + 1; |