android/sdremote/.classpath | 9 ---------
android/sdremote/AndroidManifest.xml | 15 +++++++++++----
2 files changed, 11 insertions(+), 13 deletions(-)
New commits:
commit c630a2458e9b9f19fbfa03034c8e3f20232f77df
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Thu Sep 20 20:57:14 2012 +0200
Use activity-alias to show a separate name/icon in the launcher.
By default android will use the title and icon of the the starting
activity in the launcher. This can be overriden using an activity-alias
as the default activity, with its own title and icon.
Change-Id: I794b6738fdc383879b3c056c61f62fecbb268c5a
diff --git a/android/sdremote/.classpath b/android/sdremote/.classpath
deleted file mode 100644
index 85fa731..0000000
--- a/android/sdremote/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con"
path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="con"
path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
- <classpathentry combineaccessrules="false" kind="src" path="/abs-lib"/>
- <classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/android/sdremote/AndroidManifest.xml
b/android/sdremote/AndroidManifest.xml
index 6db223e..06056a2 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -13,22 +13,29 @@
android:targetSdkVersion="10" />
<application
+ android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.ImpressRemote"
- android:title="@string/app_name"
- android:icon="@drawable/ic_launcher" >
+ android:title="@string/app_name" >
<activity
android:name=".SelectorActivity"
android:icon="@drawable/actionbar_icon_computer"
android:label="@string/selector_choose_a_computer"
android:title="@string/app_name"
android:uiOptions="splitActionBarWhenNarrow" >
+ </activity>
+
+ <activity-alias
+ android:name=".FakeLauncher"
+ android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:targetActivity=".SelectorActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
-
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
- </activity>
+ </activity-alias>
+
<activity
android:name=".PairingActivity"
android:icon="@drawable/actionbar_icon_computer"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
