diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-11-05 23:31:27 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-11-05 23:31:27 +0000 |
commit | 540dd9c2d0510636536684a4c0b88fabd5326a9b (patch) | |
tree | 34438133141b02cf141106522395f16557770713 /android | |
parent | a2a243b34e87f48272912c1e943b4a3c5b2b813b (diff) | |
download | rockbox-540dd9c2d0510636536684a4c0b88fabd5326a9b.tar.gz rockbox-540dd9c2d0510636536684a4c0b88fabd5326a9b.zip |
A bit of indentation/whitespace changes in the xml files.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28504 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android')
-rw-r--r-- | android/AndroidManifest.xml | 65 | ||||
-rw-r--r-- | android/res/layout/keyboardinput.xml | 11 | ||||
-rw-r--r-- | android/res/layout/main.xml | 3 | ||||
-rw-r--r-- | android/res/values/strings.xml | 2 |
4 files changed, 48 insertions, 33 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index f651ff6679..a05f382584 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml | |||
@@ -1,36 +1,45 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
3 | package="org.rockbox" | 3 | package="org.rockbox" |
4 | android:versionCode="1" | 4 | android:versionCode="1" |
5 | android:versionName="1.0" | 5 | android:versionName="1.0" |
6 | android:installLocation="auto"> | 6 | android:installLocation="auto"> |
7 | <application android:icon="@drawable/launcher" android:label="@string/app_name" android:debuggable="true"> | 7 | <application android:icon="@drawable/launcher" |
8 | <activity android:name=".RockboxActivity" | 8 | android:label="@string/app_name" |
9 | android:launchMode="singleTask" | 9 | android:debuggable="true"> |
10 | android:label="@string/app_name" | 10 | |
11 | android:screenOrientation="portrait" | 11 | <activity android:name=".RockboxActivity" |
12 | android:configChanges="orientation|keyboardHidden" > | 12 | android:launchMode="singleTask" |
13 | <intent-filter> | 13 | android:label="@string/app_name" |
14 | <action android:name="android.intent.action.MAIN" /> | 14 | android:screenOrientation="portrait" |
15 | <category android:name="android.intent.category.LAUNCHER" /> | 15 | android:configChanges="orientation|keyboardHidden" > |
16 | </intent-filter> | 16 | <intent-filter> |
17 | </activity> | 17 | <action android:name="android.intent.action.MAIN" /> |
18 | <service android:name=".RockboxService"/> | 18 | <category android:name="android.intent.category.LAUNCHER" /> |
19 | <receiver android:name=".Helper.MediaButtonReceiver$MediaReceiver" | 19 | </intent-filter> |
20 | android:enabled="true" | 20 | </activity> |
21 | android:exported="true"> | ||
22 | <intent-filter> | ||
23 | <action android:name="android.intent.action.MEDIA_BUTTON" /> | ||
24 | </intent-filter> | ||
25 | </receiver> | ||
26 | 21 | ||
27 | <activity android:name="KeyboardActivity" android:theme="@android:style/Theme.Dialog"></activity> | 22 | <activity android:name="KeyboardActivity" |
28 | <activity android:name="YesnoActivity" android:theme="@android:style/Theme.Dialog"></activity> | 23 | android:theme="@android:style/Theme.Dialog"> |
29 | </application> | 24 | </activity> |
30 | <uses-sdk android:minSdkVersion="4" /> | 25 | |
31 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission> | 26 | <activity android:name="YesnoActivity" |
27 | android:theme="@android:style/Theme.Dialog"> | ||
28 | </activity> | ||
32 | 29 | ||
30 | <service android:name=".RockboxService"/> | ||
31 | |||
32 | <receiver android:name=".Helper.MediaButtonReceiver$MediaReceiver" | ||
33 | android:enabled="true" | ||
34 | android:exported="true"> | ||
35 | <intent-filter> | ||
36 | <action android:name="android.intent.action.MEDIA_BUTTON" /> | ||
37 | </intent-filter> | ||
38 | </receiver> | ||
33 | 39 | ||
40 | </application> | ||
34 | 41 | ||
42 | <uses-sdk android:minSdkVersion="4" /> | ||
43 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission> | ||
35 | 44 | ||
36 | </manifest> | 45 | </manifest> |
diff --git a/android/res/layout/keyboardinput.xml b/android/res/layout/keyboardinput.xml index 124eda8fbe..215cde04f8 100644 --- a/android/res/layout/keyboardinput.xml +++ b/android/res/layout/keyboardinput.xml | |||
@@ -1,4 +1,11 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | 2 | ||
3 | <AbsoluteLayout android:id="@+id/AbsoluteLayout01" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android"><EditText android:layout_height="wrap_content" android:text="Some Text" android:layout_width="fill_parent" android:id="@+id/KbdInput"></EditText> | 3 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"> |
4 | </AbsoluteLayout> | 4 | android:layout_width="fill_parent" |
5 | android:layout_height="fill_parent" | ||
6 | <EditText android:layout_height="wrap_content" | ||
7 | android:text="Some Text" | ||
8 | android:layout_width="fill_parent" | ||
9 | android:id="@+id/KbdInput"> | ||
10 | </EditText> | ||
11 | </LinearLayout> | ||
diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml index 4361cfe8aa..840fb4ca24 100644 --- a/android/res/layout/main.xml +++ b/android/res/layout/main.xml | |||
@@ -2,6 +2,5 @@ | |||
2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
3 | android:orientation="vertical" | 3 | android:orientation="vertical" |
4 | android:layout_width="fill_parent" | 4 | android:layout_width="fill_parent" |
5 | android:layout_height="fill_parent" | 5 | android:layout_height="fill_parent"> |
6 | > | ||
7 | </LinearLayout> | 6 | </LinearLayout> |
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index a2762ddd74..729935c196 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <resources> | 2 | <resources> |
3 | 3 | ||
4 | <string name="app_name">Rockbox</string> | 4 | <string name="app_name">Rockbox</string> |
5 | <string name="notification">Rockbox</string> | 5 | <string name="notification">Rockbox</string> |
6 | <string name="OK">OK</string> | 6 | <string name="OK">OK</string> |
7 | <string name="Cancel">Cancel</string> | 7 | <string name="Cancel">Cancel</string> |