Issue #393 Fix search crashes

NineWorlds · Nov 10, 2018 · 5ec5713 · 5ec5713
1 parent 4703c79
commit 5ec5713
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/serenity-app/src/main/AndroidManifest.xml b/serenity-app/src/main/AndroidManifest.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="1009004"
-    android:versionName="1.9.4.20150220-1911"
     package="us.nineworlds.serenity">
 
   <uses-sdk
       android:minSdkVersion="21"
       android:targetSdkVersion="27"
       tools:overrideLibrary="android.support.v17.leanback"/>
 
-  <!-- try to exclude phone devices from the list. Currently only support Tablets and TVs -->
+  <!-- try to exclude phone devices from the list. Currently only support TVs -->
   <supports-screens
       android:largeScreens="true"
       android:normalScreens="false"
@@ -148,19 +146,6 @@
         android:screenOrientation="landscape"
         android:theme="@style/Theme.AppCompat.NoActionBar.FullScreen"/>
 
-    <activity
-        android:name=".ui.video.player.SerenitySurfaceViewVideoActivity"
-        android:screenOrientation="sensorLandscape"
-        android:theme="@style/Theme.AppCompat.NoActionBar.FullScreen">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
-      </intent-filter>
-    </activity>
-
     <activity
         android:name=".ui.video.player.RecommendationPlayerActivity"
         android:screenOrientation="sensorLandscape"
@@ -186,9 +171,6 @@
         android:enabled="true"
         android:exported="true"/>
 
-    <provider
-        android:name=".ui.search.SerenitySuggestionProvider"
-        android:authorities="us.nineworlds.serenity.ui.search.SerenitySuggestionProvider"/>
     <provider
         android:name=".core.SerenityRecommendationContentProvider"
         android:authorities="us.nineworlds.serenity.core.SerenityRecommendationContentProvider"

diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/SearchActivity.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/SearchActivity.java
@@ -23,12 +23,12 @@
 
 package us.nineworlds.serenity.ui.leanback.search;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
 import us.nineworlds.serenity.R;
 
-public class SearchActivity extends Activity {
+public class SearchActivity extends FragmentActivity {
 
   @Override protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);