commit 17f2a0bdacddc8e2fd699dfa9e245aec8fd4a083 Author: Nathan Freitas nathan@freitas.net Date: Wed Feb 4 12:37:04 2015 -0500
remove unused alt manifests --- AndroidManifest.KITKAT_AND_LOWER.xml | 132 ---------------------------------- AndroidManifest.LOLLIPOP.xml | 132 ---------------------------------- 2 files changed, 264 deletions(-)
diff --git a/AndroidManifest.KITKAT_AND_LOWER.xml b/AndroidManifest.KITKAT_AND_LOWER.xml deleted file mode 100644 index 5ba968d..0000000 --- a/AndroidManifest.KITKAT_AND_LOWER.xml +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" - android:versionName="14.1.4-noPIE" - android:versionCode="132" - android:installLocation="auto" - > - - <uses-sdk android:minSdkVersion="9" android:maxSdkVersion="20" android:targetSdkVersion="19"/> - <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission> - - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/> - <uses-permission android:name="org.torproject.android.MANAGE_TOR"/> - - <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" - android:label="@string/app_name" - android:description="@string/app_description" - android:configChanges="locale|orientation|screenSize" - android:theme="@style/CustomActionBarTheme" - android:allowBackup="false" - android:allowClearUserData="true" - android:persistent="true" - android:stopWithTask="false" - android:largeHeap="false" - > - - <activity android:name=".Orbot" - android:configChanges="orientation|screenSize" - android:excludeFromRecents="true" - android:launchMode="singleTop" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> -<!-- - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - </intent-filter> ---> - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - <data android:scheme="bridge" /> - </intent-filter> - - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.REQUEST_HS_PORT" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.START_TOR" /> - </intent-filter> - - <!-- - <intent-filter> - <action android:name="android.intent.action.SEND" /> - - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.ALTERNATIVE" /> - <category android:name="android.intent.category.SELECTED_ALTERNATIVE" /> - - <data android:mimeType="*/*" /> - </intent-filter> - --> - - </activity> - - <!-- - <activity android:name=".OrbotDiagnosticsActivity" android:label="OrbotDiag"/> - --> - <activity - android:name=".service.DummyActivity" - android:theme="@android:style/Theme.NoDisplay" - android:enabled="true" - android:allowTaskReparenting="true" - android:noHistory="true" - android:excludeFromRecents="true" - android:alwaysRetainTaskState="false" - android:stateNotNeeded="true" - android:clearTaskOnLaunch="true" - android:finishOnTaskLaunch="true" - /> - - - <activity android:name=".wizard.LotsaText" android:exported="false"/> - <activity android:name=".wizard.Permissions" android:exported="false"/> - <activity android:name=".wizard.TipsAndTricks" android:exported="false"/> - <activity android:name=".wizard.ConfigureTransProxy" android:exported="false"/> - <activity android:name=".wizard.ChooseLocaleWizardActivity" android:exported="false"/> - - <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> - <activity android:name=".settings.AppManager" android:label="@string/app_name"/> - - <service android:enabled="true" - android:name=".service.TorService" - android:permission="org.torproject.android.MANAGE_TOR" - android:stopWithTask="false" - > - <intent-filter> - <action android:name="org.torproject.android.service.ITorService" /> - <action android:name="org.torproject.android.service.TOR_SERVICE" /> - </intent-filter> - </service> - - <receiver android:name=".OnBootReceiver"> - <intent-filter> - <action android:name="android.intent.action.BOOT_COMPLETED" /> - <action android:name="android.intent.action.QUICKBOOT_POWERON" /> - <action android:name="android.intent.action.MEDIA_MOUNTED"/> - </intent-filter> - </receiver> - - - <service android:name="org.torproject.android.vpn.OrbotVpnService" - android:permission="android.permission.BIND_VPN_SERVICE"> - <intent-filter> - <action android:name="android.net.VpnService"/> - </intent-filter> - </service> - - </application> - - -</manifest> diff --git a/AndroidManifest.LOLLIPOP.xml b/AndroidManifest.LOLLIPOP.xml deleted file mode 100644 index 70841f4..0000000 --- a/AndroidManifest.LOLLIPOP.xml +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" - android:versionName="14.1.4-PIE" - android:versionCode="133" - android:installLocation="auto" - > - - <uses-sdk android:minSdkVersion="21" android:maxSdkVersion="21" android:targetSdkVersion="21"/> - <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission> - - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/> - <uses-permission android:name="org.torproject.android.MANAGE_TOR"/> - - <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" - android:label="@string/app_name" - android:description="@string/app_description" - android:configChanges="locale|orientation|screenSize" - android:theme="@style/CustomActionBarTheme" - android:allowBackup="false" - android:allowClearUserData="true" - android:persistent="true" - android:stopWithTask="false" - android:largeHeap="false" - > - - <activity android:name=".Orbot" - android:configChanges="orientation|screenSize" - android:excludeFromRecents="true" - android:launchMode="singleTop" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> -<!-- - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - </intent-filter> ---> - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - <data android:scheme="bridge" /> - </intent-filter> - - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.REQUEST_HS_PORT" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.START_TOR" /> - </intent-filter> - - <!-- - <intent-filter> - <action android:name="android.intent.action.SEND" /> - - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.ALTERNATIVE" /> - <category android:name="android.intent.category.SELECTED_ALTERNATIVE" /> - - <data android:mimeType="*/*" /> - </intent-filter> - --> - - </activity> - - <!-- - <activity android:name=".OrbotDiagnosticsActivity" android:label="OrbotDiag"/> - --> - <activity - android:name=".service.DummyActivity" - android:theme="@android:style/Theme.NoDisplay" - android:enabled="true" - android:allowTaskReparenting="true" - android:noHistory="true" - android:excludeFromRecents="true" - android:alwaysRetainTaskState="false" - android:stateNotNeeded="true" - android:clearTaskOnLaunch="true" - android:finishOnTaskLaunch="true" - /> - - - <activity android:name=".wizard.LotsaText" android:exported="false"/> - <activity android:name=".wizard.Permissions" android:exported="false"/> - <activity android:name=".wizard.TipsAndTricks" android:exported="false"/> - <activity android:name=".wizard.ConfigureTransProxy" android:exported="false"/> - <activity android:name=".wizard.ChooseLocaleWizardActivity" android:exported="false"/> - - <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> - <activity android:name=".settings.AppManager" android:label="@string/app_name"/> - - <service android:enabled="true" - android:name=".service.TorService" - android:permission="org.torproject.android.MANAGE_TOR" - android:stopWithTask="false" - > - <intent-filter> - <action android:name="org.torproject.android.service.ITorService" /> - <action android:name="org.torproject.android.service.TOR_SERVICE" /> - </intent-filter> - </service> - - <receiver android:name=".OnBootReceiver"> - <intent-filter> - <action android:name="android.intent.action.BOOT_COMPLETED" /> - <action android:name="android.intent.action.QUICKBOOT_POWERON" /> - <action android:name="android.intent.action.MEDIA_MOUNTED"/> - </intent-filter> - </receiver> - - - <service android:name="org.torproject.android.vpn.OrbotVpnService" - android:permission="android.permission.BIND_VPN_SERVICE"> - <intent-filter> - <action android:name="android.net.VpnService"/> - </intent-filter> - </service> - - </application> - - -</manifest>