Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Merge branch 'release/0.6.2' into develop

Browse Source 
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@234 5bc14d19-1e4b-4ba2-aa50-860af135f48c
This commit is contained in:
Juan Miguel Boyero Corral 2012-01-10 20:42:30 +00:00
commit a0e58a966e
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
HISTORY.md
View File

@ -1,3 +1,11 @@
## 0.6.2 (2011-12-09)
* Added Blog URL to preferences screen
* Added Catalan language by Francisco Manuel Herrero Pérez
* Updated ksoap2-android library
* Reinitialized last course selected on database cleaning
* Minor changes on error messages
## 0.6.1 (2011-11-16) ## 0.6.1 (2011-11-16)
* Added Google+ account to preferences screen * Added Google+ account to preferences screen

2
SWADroid/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="es.ugr.swad.swadroid" package="es.ugr.swad.swadroid"
android:installLocation="auto" android:versionName="0.6.1" android:versionCode="27"> android:installLocation="auto" android:versionName="0.6.2" android:versionCode="28">
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher_swadroid" android:debuggable="true"> <application android:label="@string/app_name" android:icon="@drawable/ic_launcher_swadroid" android:debuggable="true">
<activity android:name=".SWADMain" <activity android:name=".SWADMain"
android:label="@string/app_name" android:label="@string/app_name"

6
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java
View File

@ -220,15 +220,15 @@ public class NotificationsCursorAdapter extends CursorAdapter {
viewType = String.valueOf(eventType.getText()); viewType = String.valueOf(eventType.getText());
marksType = ctx.getString(R.string.marksFile); marksType = ctx.getString(R.string.marksFile);
if(viewType.equals(marksType)) { /*if(viewType.equals(marksType)) {
TextView content = (TextView) view.findViewById(R.id.eventText); TextView content = (TextView) view.findViewById(R.id.eventText);
Intent activity = new Intent(ctx.getApplicationContext(), Marks.class); Intent activity = new Intent(ctx.getApplicationContext(), Marks.class);
activity.putExtra("content", content.getText().toString()); activity.putExtra("content", content.getText().toString());
ctx.startActivity(activity); ctx.startActivity(activity);
} else { } else {*/
contentVisible[position] = !contentVisible[position]; contentVisible[position] = !contentVisible[position];
this.notifyDataSetChanged(); this.notifyDataSetChanged();
} //}
} }
} }