From 6f3279d62716b3242c16aed1a629e7c425337955 Mon Sep 17 00:00:00 2001
From: Eder Bastos <bastos.eder@gmail.com>
Date: Tue, 2 Jun 2015 16:44:31 -0400
Subject: [PATCH] Android: Remove old UI references from manifest, and set the
 new UI Activity's title to "Dolphin Emulator'

---
 .../Android/app/src/main/AndroidManifest.xml  | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
index 31a673c51d..3c87d9fd41 100644
--- a/Source/Android/app/src/main/AndroidManifest.xml
+++ b/Source/Android/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:label="@string/app_name"
         android:icon="@drawable/ic_launcher"
         android:allowBackup="true"
         android:supportsRtl="true"
@@ -26,7 +27,6 @@
 
         <activity
             android:name=".activities.GameGridActivity"
-            android:label="@string/title_new_ui"
             android:theme="@style/DolphinGamecube">
 
             <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
@@ -48,39 +48,10 @@
             android:theme="@style/DolphinSettingsGamecube"
             android:label="@string/grid_menu_settings"/>
 
-        <activity
-            android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"
-            android:label="@string/app_name"
-            android:theme="@android:style/Theme.Holo.Light" >
-
-            <!-- Having a second activity with this intent-filter means we have two choices from the home screen. -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
         <activity
             android:name=".activities.EmulationActivity"
             android:theme="@style/DolphinEmulationGamecube"/>
 
-        <activity
-            android:name=".about.AboutActivity"
-            android:theme="@android:style/Theme.Holo.Light" />
-
-        <activity
-            android:name=".emulation.EmulationActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".settings.input.overlayconfig.OverlayConfigActivity"
-            android:screenOrientation="landscape"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
-
-        <activity
-            android:name=".settings.PrefsActivity"
-            android:label="@string/settings"
-            android:theme="@android:style/Theme.Holo.Light" />
 
         <service android:name=".services.AssetCopyService"/>