Merge de jibe
authorDa Risk <darisk972@gmail.com>
Tue, 07 Apr 2009 15:20:28 +0200
changeset 71 fb3e3ed4bafc
parent 70 31b436663df5 (diff)
parent 69 cc06de2dfff0 (current diff)
child 79 eb9112a00b02
child 81 b99c01522c62
child 84 9a4dbd7fe546
Merge de jibe
AndroidManifest.xml
res/layout/beem.xml
res/layout/beemdialogsettings.xml
res/menu/beemmenu.xml
src/com/beem/project/beem/service/XMPPConnectionAdapter.java
src/com/beem/project/beem/service/XMPPFacade.java
src/com/beem/project/beem/service/aidl/IXMPPConnection.aidl
src/com/beem/project/beem/service/aidl/IXMPPFacade.aidl
src/com/beem/project/beem/ui/Beem.java
src/com/beem/project/beem/ui/BeemDialogSettings.java
--- a/AndroidManifest.xml	Sat Apr 04 20:03:43 2009 +0200
+++ b/AndroidManifest.xml	Tue Apr 07 15:20:28 2009 +0200
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.beem.project.beem" android:versionCode="1"
 	android:versionName="1.0">
-	<application android:label="@string/app_name" android:name="BeemApplication">
+	<application android:label="@string/app_name" android:name="BeemApplication" android:theme="@style/customtheme">
 		<activity android:name=".ui.ContactList" android:label="@string/app_name">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
Binary file res/drawable/background.png has changed
Binary file res/drawable/xmpp.jpg has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values/style.xml	Tue Apr 07 15:20:28 2009 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="customtheme" parent="android:Theme">
+ </style>
+ 
+  	<style name="customtheme.login"> 
+    <item name="android:windowBackground">@drawable/background</item>
+    <item name="android:windowNoTitle">true</item>
+
+ 
+  </style>        
+</resources>
\ No newline at end of file