Stellarium

Merge lp:~alexwolf/stellarium/android-basic-ui into lp:~brady.brenot/stellarium/android-port

  1. android-basic-ui
  2. Merge into android-port
Proposed by Alexander Wolf
Status: Merged
Merged at revision: 5170
Proposed branch: lp:~alexwolf/stellarium/android-basic-ui
Merge into: lp:~brady.brenot/stellarium/android-port
Diff against target: 32 lines (+2/-2)
2 files modified
android/java/AndroidManifest.xml.cmake (+1/-1)
android/java/res/values/strings.xml (+1/-1)
To merge this branch: bzr merge lp:~alexwolf/stellarium/android-basic-ui
Reviewer Review Type Date Requested Status
Brady Brenot Approve
Review via email: mp+97856@code.launchpad.net

Description of the change

I'm added Stellarium's icon for android port and set name of application to Manifest.

To post a comment you must log in.
Revision history for this message
Brady Brenot (brady.brenot) :
review: Approve
Revision history for this message
Brady Brenot (brady.brenot) wrote :

Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'android/java/AndroidManifest.xml.cmake'
2--- android/java/AndroidManifest.xml.cmake 2012-03-04 07:49:21 +0000
3+++ android/java/AndroidManifest.xml.cmake 2012-03-16 12:00:25 +0000
4@@ -4,7 +4,7 @@
5 android:sharedUserId="org.stellarium.stellarium"
6 android:versionCode="1"
7 android:versionName="@ANDROID_VERSION_NAME@">
8- <application android:name="org.kde.necessitas.origo.QtApplication" android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
9+ <application android:name="org.kde.necessitas.origo.QtApplication" android:icon="@drawable/stellarium_icon" android:label="@string/app_name" android:debuggable="true">
10 <activity android:name="org.kde.necessitas.origo.QtActivity" android:label="@string/app_name" android:configChanges="orientation|locale|fontScale|keyboard|keyboardHidden" android:screenOrientation="portrait" >
11 <intent-filter>
12 <action android:name="android.intent.action.MAIN"/>
13
14=== added file 'android/java/res/drawable-hdpi/stellarium_icon.png'
15Binary files android/java/res/drawable-hdpi/stellarium_icon.png 1970-01-01 00:00:00 +0000 and android/java/res/drawable-hdpi/stellarium_icon.png 2012-03-16 12:00:25 +0000 differ
16=== added file 'android/java/res/drawable-ldpi/stellarium_icon.png'
17Binary files android/java/res/drawable-ldpi/stellarium_icon.png 1970-01-01 00:00:00 +0000 and android/java/res/drawable-ldpi/stellarium_icon.png 2012-03-16 12:00:25 +0000 differ
18=== added file 'android/java/res/drawable-mdpi/stellarium_icon.png'
19Binary files android/java/res/drawable-mdpi/stellarium_icon.png 1970-01-01 00:00:00 +0000 and android/java/res/drawable-mdpi/stellarium_icon.png 2012-03-16 12:00:25 +0000 differ
20=== added file 'android/java/res/drawable/stellarium_icon.png'
21Binary files android/java/res/drawable/stellarium_icon.png 1970-01-01 00:00:00 +0000 and android/java/res/drawable/stellarium_icon.png 2012-03-16 12:00:25 +0000 differ
22=== modified file 'android/java/res/values/strings.xml'
23--- android/java/res/values/strings.xml 2012-02-07 02:55:37 +0000
24+++ android/java/res/values/strings.xml 2012-03-16 12:00:25 +0000
25@@ -1,6 +1,6 @@
26 <?xml version='1.0' encoding='utf-8'?>
27 <resources>
28- <string name="app_name"></string>
29+ <string name="app_name">Stellarium</string>
30 <string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string>
31 <string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string>
32 <string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string>

Subscribers

People subscribed via source and target branches