Android: Remove old UI references from manifest, and set the new UI Activity's title to "Dolphin Emulator'
This commit is contained in:
parent
dbdc8121f0
commit
6f3279d627
|
@ -18,6 +18,7 @@
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
|
android:label="@string/app_name"
|
||||||
android:icon="@drawable/ic_launcher"
|
android:icon="@drawable/ic_launcher"
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
|
@ -26,7 +27,6 @@
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".activities.GameGridActivity"
|
android:name=".activities.GameGridActivity"
|
||||||
android:label="@string/title_new_ui"
|
|
||||||
android:theme="@style/DolphinGamecube">
|
android:theme="@style/DolphinGamecube">
|
||||||
|
|
||||||
<!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
|
<!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
|
||||||
|
@ -48,39 +48,10 @@
|
||||||
android:theme="@style/DolphinSettingsGamecube"
|
android:theme="@style/DolphinSettingsGamecube"
|
||||||
android:label="@string/grid_menu_settings"/>
|
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
|
<activity
|
||||||
android:name=".activities.EmulationActivity"
|
android:name=".activities.EmulationActivity"
|
||||||
android:theme="@style/DolphinEmulationGamecube"/>
|
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"/>
|
<service android:name=".services.AssetCopyService"/>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue