Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Amab
Amab committed Nov 23, 2014
2 parents bf8ccab + 0c82a29 commit e7ce4a5
Show file tree
Hide file tree
Showing 151 changed files with 2,879 additions and 3,436 deletions.
6 changes: 3 additions & 3 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,18 @@
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="ksoap2-j2se-3.3.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
<orderEntry type="library" exported="" name="ksoap2-android-3.3.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
<orderEntry type="library" exported="" name="kxml-2.2.4" level="project" />
<orderEntry type="library" exported="" name="kobjects-j2me-0.0-SNAPSHOT-20040926-2" level="project" />
<orderEntry type="library" exported="" name="xmlpull-1.1.3.3" level="project" />
<orderEntry type="library" exported="" name="ksoap2-base-3.3.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" name="gson-2.3" level="project" />
<orderEntry type="library" exported="" name="play-services-6.1.71" level="project" />
<orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
<orderEntry type="library" exported="" name="core-2.1" level="project" />
</component>
</module>
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ android {
}

dependencies {
compile 'com.android.support:support-v4:21.0.0'
compile 'com.android.support:appcompat-v7:21.0.0'
compile 'com.android.support:support-v4:21.0.2'
compile 'com.android.support:appcompat-v7:21.0.2'
compile 'com.google.android.gms:play-services:6.1.71'
compile 'com.google.zxing:core:2.1'
compile 'com.google.code.gson:gson:2.3'
Expand Down
95 changes: 58 additions & 37 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="es.ugr.swad.swadroid"
android:installLocation="auto"
android:versionCode="64"
android:versionName="1.1.4" >
android:versionCode="65"
android:versionName="1.2" >

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down Expand Up @@ -68,36 +68,38 @@
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.rollcall.Rollcall"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light"
android:label="@string/rollcallModuleLabel"
android:parentActivityName="es.ugr.swad.swadroid.SWADMain"
android:screenOrientation="portrait" >
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="es.ugr.swad.swadroid.SWADMain" />
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.rollcall.RollcallConfigDownload"
android:label="@string/rollcallModuleLabel" >
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.rollcall.sessions.NewPracticeSession"
android:label="@string/sessionModuleLabel" >
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.rollcall.sessions.SessionsHistory"
android:label="@string/rollcallHistoryModuleLabel" >
android:name=".modules.rollcall.EventsDownload"
android:label="@string/rollcallModuleLabel"
android:theme="@style/Theme.AppCompat.Translucent" >
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.rollcall.sessions.SessionsList"
android:label="@string/sessionModuleLabel" >
android:name=".modules.rollcall.UsersActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light"
android:label="@string/rollcallModuleLabel"
android:parentActivityName="es.ugr.swad.swadroid.modules.rollcall.Rollcall" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="es.ugr.swad.swadroid.modules.rollcall.Rollcall" />
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.rollcall.students.StudentsHistory"
android:label="@string/studentsHistoryModuleLabel" >
android:name=".modules.rollcall.UsersDownload"
android:label="@string/rollcallModuleLabel"
android:theme="@style/Theme.AppCompat.Translucent" >
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.rollcall.students.StudentsList"
android:label="@string/sessionModuleLabel" >
android:name=".modules.rollcall.UsersSend"
android:label="@string/rollcallModuleLabel"
android:theme="@style/Theme.AppCompat.Translucent" >
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.Groups"
Expand Down Expand Up @@ -128,9 +130,19 @@
android:name="android.support.PARENT_ACTIVITY"
android:value="es.ugr.swad.swadroid.SWADMain" />
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.notifications.NotificationItem"
android:label="@string/notificationsModuleLabel"
android:theme="@style/Theme.AppCompat.Light"
android:parentActivityName="es.ugr.swad.swadroid.modules.notifications.Notifications" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="es.ugr.swad.swadroid.modules.notifications.Notifications" />
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.tests.Tests"
android:label="@string/testsModuleLabel"
android:theme="@style/Theme.AppCompat.Light"
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
Expand All @@ -149,39 +161,44 @@
<activity
android:name="es.ugr.swad.swadroid.modules.tests.TestsMake"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:label="@string/testsModuleLabel" >
android:theme="@style/Theme.AppCompat.Light"
android:label="@string/testsModuleLabel"
android:parentActivityName="es.ugr.swad.swadroid.modules.tests.Tests">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="es.ugr.swad.swadroid.modules.tests.Tests" />
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.messages.Messages"
android:configChanges="orientation|screenSize"
android:label="@string/messagesModuleLabel">
android:theme="@style/Theme.AppCompat.Light"
android:label="@string/messagesModuleLabel"
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="es.ugr.swad.swadroid.SWADMain" />
</activity>
<activity
<activity
android:name="es.ugr.swad.swadroid.modules.messages.FilterUsersList"
android:configChanges="orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light"
android:label="@string/filterUsersListModuleLabel">
</activity>
<activity
<activity
android:name="es.ugr.swad.swadroid.modules.messages.UsersList"
android:configChanges="orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light"
android:label="@string/messagesModuleLabel">
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.notifications.NotificationItem"
android:label="@string/notificationsModuleLabel"
android:name="es.ugr.swad.swadroid.modules.Notices"
android:label="@string/noticesModuleLabel"
android:theme="@style/Theme.AppCompat.Translucent"
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="es.ugr.swad.swadroid.SWADMain" />
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.Notices"
android:label="@string/noticesModuleLabel"
android:theme="@style/Theme.AppCompat.Translucent" >
</activity>
<activity android:name="es.ugr.swad.swadroid.sync.AccountAuthenticator" >
</activity>
<activity
Expand All @@ -197,6 +214,7 @@
<activity
android:name="es.ugr.swad.swadroid.modules.downloads.DownloadsManager"
android:label="@string/documentsDownloadModuleLabel"
android:theme="@style/Theme.AppCompat.Light"
android:parentActivityName="es.ugr.swad.swadroid.SWADMain"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" >
<meta-data
Expand All @@ -206,6 +224,7 @@
<activity
android:name="es.ugr.swad.swadroid.modules.groups.MyGroupsManager"
android:label="@string/myGroupsModuleLabel"
android:theme="@style/Theme.AppCompat.Light"
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
Expand All @@ -223,6 +242,7 @@
</activity>
<activity
android:name="es.ugr.swad.swadroid.modules.GenerateQR"
android:theme="@style/Theme.AppCompat.Light"
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
Expand All @@ -231,6 +251,7 @@
<activity
android:name="es.ugr.swad.swadroid.modules.information.Information"
android:configChanges="orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light"
android:label="@string/informationModuleLabel"
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
<meta-data
Expand All @@ -242,6 +263,12 @@
android:label="@string/notificationsMarkAllAsReadModuleLabel"
android:theme="@style/Theme.AppCompat.Translucent" >
</activity>
<activity
android:name="es.ugr.swad.swadroid.LoginActivity"
android:theme="@style/Theme.AppCompat.Light"
android:label="@string/title_activity_login"
android:windowSoftInputMode="adjustResize|stateVisible" >
</activity>

<provider
android:name="es.ugr.swad.swadroid.sync.DummyProvider"
Expand Down Expand Up @@ -271,12 +298,6 @@
android:name="android.content.SyncAdapter"
android:resource="@xml/sync_notifications" />
</service>

<activity
android:name="es.ugr.swad.swadroid.LoginActivity"
android:label="@string/title_activity_login"
android:windowSoftInputMode="adjustResize|stateVisible" >
</activity>
</application>

</manifest>
Loading

0 comments on commit e7ce4a5

Please sign in to comment.