summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2014-05-31 10:11:08 +0200
committerlado <herrlado@gmail.com>2014-05-31 10:11:08 +0200
commitc850724ef3ff1605c2fd68e2a1afa583cd11706c (patch)
tree06e209536bf2f653f49ca507668a48ef93eb180e
parent04fb34e792dffa05b144f05262a48156b2a0bb0e (diff)
downloadvdr-manager-c850724ef3ff1605c2fd68e2a1afa583cd11706c.tar.gz
vdr-manager-c850724ef3ff1605c2fd68e2a1afa583cd11706c.tar.bz2
12v12
-rw-r--r--vdr-vdrmanager/HISTORY5
-rw-r--r--vdrmanager/AndroidManifest.xml4
-rw-r--r--vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java13
3 files changed, 11 insertions, 11 deletions
diff --git a/vdr-vdrmanager/HISTORY b/vdr-vdrmanager/HISTORY
index d4fe871..1a19269 100644
--- a/vdr-vdrmanager/HISTORY
+++ b/vdr-vdrmanager/HISTORY
@@ -1,5 +1,10 @@
VDR Plugin 'vdrmanager' Revision History
------------------------------------
+2014-05-31: Version 0.12 (http://projects.vdr-developer.org/versions/show/342)
+- Feature #1687: Enable compression as default
+- Feature #1688: Send VPS Time if presend on an schedule
+- Feature #1700: send flag IsNew to android
+
2014-01-02: Version 0.11 (http://projects.vdr-developer.org/versions/show/339)
- Bug #1661: Link libz (Makefile)
diff --git a/vdrmanager/AndroidManifest.xml b/vdrmanager/AndroidManifest.xml
index 771719a..a199013 100644
--- a/vdrmanager/AndroidManifest.xml
+++ b/vdrmanager/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.bjusystems.vdrmanager"
- android:versionCode="1260"
- android:versionName="12-beta-6" >
+ android:versionCode="1291"
+ android:versionName="12.9" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java
index 7c725b1..33af528 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java
@@ -165,10 +165,10 @@ public class EpgDetailsActivity extends ICSBaseActivity implements
// timerable = (Timerable) cEvent;
}
- adapter = new Adapter();
+
pager = (ViewPager) findViewById(R.id.viewpager);
pager.setOnPageChangeListener(this);
- pager.setAdapter(adapter);
+
new VoidAsyncTask() {
@@ -209,15 +209,10 @@ public class EpgDetailsActivity extends ICSBaseActivity implements
@Override
protected void onPostExecute(Void result) {
-
- // cEvent = epgs.get(counter);
- adapter.notifyDataSetChanged();
+ adapter = new Adapter();
+ pager.setAdapter(adapter);
pager.setCurrentItem(counter);
onPageSelected(counter);
- // current = counter;
- // indicator.setViewPager(pager);
-
- // publishEPG(epg);
}
}.execute((Void) null);