mirror
/
transdroid
mirror of https://github.com/erickok/transdroid.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into dev

pull/82/head
Eric Kok 11 years ago
parent
ffdf8bfb12 e14bc34bdc
commit
0c29677f4e
3 changed files with 7 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      core/AndroidManifest.xml
  2. 4
      full/AndroidManifest.xml
  3. 6
      lite/AndroidManifest.xml

2
core/AndroidManifest.xml
Unescape View File

@ -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

4
full/AndroidManifest.xml
Unescape View File

@ -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
@ -278,4 +278,4 @@
</receiver> </receiver>
</application> </application>
</manifest> </manifest>

6
lite/AndroidManifest.xml
Unescape View File

@ -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" />
@ -223,4 +225,4 @@
</receiver> </receiver>
</application> </application>
</manifest> </manifest>

Write Preview
Loading…
Cancel
Save