summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/AndroidManifest.xml16
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt2
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt5
3 files changed, 22 insertions, 1 deletions
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 03e2318ade..4ad413767d 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -12,6 +12,8 @@
android:required="false" />
<uses-feature android:name="android.hardware.screen.landscape"
android:required="false" />
+ <uses-feature android:name="android.software.leanback"
+ android:required="false" />
<application android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher"
@@ -33,6 +35,20 @@
<action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
</intent-filter>
</activity>
+ <activity android:name="net.mullvad.mullvadvpn.ui.activities.TVActivity"
+ android:label="@string/app_name"
+ android:launchMode="singleTask"
+ android:configChanges="orientation|screenSize|screenLayout"
+ android:screenOrientation="sensor"
+ android:windowSoftInputMode="adjustPan">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
+ </intent-filter>
+ </activity>
<service android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
android:permission="android.permission.BIND_VPN_SERVICE">
<intent-filter>
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index 2d597929dd..c1be537c71 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -24,7 +24,7 @@ import net.mullvad.mullvadvpn.service.MullvadVpnService
import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnection
import net.mullvad.talpid.util.EventNotifier
-class MainActivity : FragmentActivity() {
+open class MainActivity : FragmentActivity() {
companion object {
val KEY_SHOULD_CONNECT = "should_connect"
}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt
new file mode 100644
index 0000000000..c83c47e7cd
--- /dev/null
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt
@@ -0,0 +1,5 @@
+package net.mullvad.mullvadvpn.ui.activities
+
+import net.mullvad.mullvadvpn.ui.MainActivity
+
+class TVActivity : MainActivity()