Browse Source

Merge branch 'master' into dev

pull/82/head
Eric Kok 11 years ago
parent
commit
0c29677f4e
  1. 2
      core/AndroidManifest.xml
  2. 2
      full/AndroidManifest.xml
  3. 4
      lite/AndroidManifest.xml

2
core/AndroidManifest.xml

@ -17,7 +17,7 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.transdroid.core" package="org.transdroid.core"
android:versionCode="7" android:versionCode="207"
android:versionName="2.0.1" > android:versionName="2.0.1" >
<uses-sdk <uses-sdk

2
full/AndroidManifest.xml

@ -17,7 +17,7 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.transdroid.full" package="org.transdroid.full"
android:versionCode="7" android:versionCode="207"
android:versionName="2.0.1" > android:versionName="2.0.1" >
<uses-sdk <uses-sdk

4
lite/AndroidManifest.xml

@ -17,7 +17,7 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.transdroid.lite" package="org.transdroid.lite"
android:versionCode="7" android:versionCode="207"
android:versionName="2.0.1" > android:versionName="2.0.1" >
<uses-sdk <uses-sdk
@ -53,6 +53,7 @@
<activity <activity
android:name="org.transdroid.core.gui.TorrentsActivity_" android:name="org.transdroid.core.gui.TorrentsActivity_"
android:allowTaskReparenting="true" android:allowTaskReparenting="true"
android:launchMode="singleTop"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/TransdroidTheme" android:theme="@style/TransdroidTheme"
android:uiOptions="splitActionBarWhenNarrow" > android:uiOptions="splitActionBarWhenNarrow" >
@ -197,6 +198,7 @@
<!-- Home screen widget --> <!-- Home screen widget -->
<activity <activity
android:name="org.transdroid.core.widget.WidgetConfigActivity_" android:name="org.transdroid.core.widget.WidgetConfigActivity_"
android:theme="@style/TransdroidTheme.WidgetConfig"
android:enabled="@bool/widget_available" > android:enabled="@bool/widget_available" >
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" /> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />

Loading…
Cancel
Save