Merge remote-tracking branch 'origin/master'

daig0rian · Jun 27, 2021 · fa4dc9f · fa4dc9f
2 parents 0fedced + 4b682d1
commit fa4dc9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -45,8 +45,7 @@
             android:theme="@style/CustomizedSearch"
             android:screenOrientation="landscape"/>
         <activity android:name=".SettingsActivity"
-            android:theme="@style/LeanbackPreferences"
-            android:screenOrientation="landscape"/>
+            android:theme="@style/LeanbackPreferences"/>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/daigorian/epcltvapp/SettingsActivity.kt b/app/src/main/java/com/daigorian/epcltvapp/SettingsActivity.kt
@@ -2,12 +2,16 @@ package com.daigorian.epcltvapp
 
 
 import android.app.Activity
+import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+import android.os.Build
 import android.os.Bundle
 
 class SettingsActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
-
+        if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+            requestedOrientation = SCREEN_ORIENTATION_LANDSCAPE
+        }
     }
 }