Permalink
Browse files

Merge branch 'android-12'

  • Loading branch information...
2 parents e3a8bf8 + e31337c commit 66857effa0a48be7a97d77899ca2aac40f6cdc29 @tgwizard committed Aug 1, 2012
View
@@ -5,80 +5,72 @@
android:versionCode="26"
android:versionName="1.3.7">
+ <supports-screens
+ android:resizeable="true"
+ android:smallScreens="true"
+ android:normalScreens="true"
+ android:largeScreens="true"
+ android:xlargeScreens="true"
+ android:anyDensity="true" />
+
+ <uses-sdk
+ android:minSdkVersion="7"
+ android:targetSdkVersion="12" />
+
+ <uses-feature
+ android:name="android.hardware.touchscreen"
+ android:required="false" />
+
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
<application
android:icon="@drawable/icon"
android:label="@string/app_name"
android:description="@string/about_text">
+ <!-- the start/launch activity -->
<activity
android:name="com.adam.aslfms.SettingsActivity"
android:label="@string/app_name"
- android:icon="@drawable/icon"
- android:exported="true">
+ android:icon="@drawable/icon">
<intent-filter>
- <action
- android:name="android.intent.action.MAIN" />
- <category
- android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity
- android:name="com.adam.aslfms.UserCredsListScreen"
- android:exported="false">
- </activity>
- <activity
- android:name="com.adam.aslfms.MusicAppsScreen"
- android:exported="false">
- </activity>
- <activity
- android:name="com.adam.aslfms.OptionsScreen"
- android:exported="false">
- </activity>
- <activity
- android:name="com.adam.aslfms.UserCredActivity"
- android:exported="false">
- </activity>
- <activity
- android:name="com.adam.aslfms.StatusActivity"
- android:exported="false">
- </activity>
- <activity
- android:name="com.adam.aslfms.StatusInfoNetApp"
- android:exported="false">
- </activity>
- <activity
- android:name="com.adam.aslfms.ViewScrobbleCacheActivity"
- android:exported="false">
- </activity>
+ <!-- other activities -->
+ <activity android:name="com.adam.aslfms.UserCredsListScreen" />
+ <activity android:name="com.adam.aslfms.MusicAppsScreen" />
+ <activity android:name="com.adam.aslfms.OptionsScreen" />
+ <activity android:name="com.adam.aslfms.UserCredActivity" />
+ <activity android:name="com.adam.aslfms.StatusActivity" />
+ <activity android:name="com.adam.aslfms.StatusInfoNetApp" />
+ <activity android:name="com.adam.aslfms.ViewScrobbleCacheActivity" />
+ <!-- the service -->
<service
android:name="com.adam.aslfms.service.ScrobblingService"
android:enabled="true"
android:exported="false">
<intent-filter>
- <action
- android:name="com.adam.aslfms.service.playstatechanged" />
- <action
- android:name="com.adam.aslfms.service.authenticate" />
- <action
- android:name="com.adam.aslfms.service.clearcreds" />
- <action
- android:name="com.adam.aslfms.service.justscrobble" />
+ <action android:name="com.adam.aslfms.service.playstatechanged" />
+ <action android:name="com.adam.aslfms.service.authenticate" />
+ <action android:name="com.adam.aslfms.service.clearcreds" />
+ <action android:name="com.adam.aslfms.service.justscrobble" />
</intent-filter>
</service>
+ <!-- the receivers -->
<receiver
android:name="com.adam.aslfms.receiver.AndroidMusicReceiver"
android:exported="true"
android:enabled="true">
<intent-filter>
- <action
- android:name="com.android.music.metachanged" />
- <action
- android:name="com.android.music.playstatechanged" />
- <action
- android:name="com.android.music.playbackcomplete" />
+ <action android:name="com.android.music.metachanged" />
+ <action android:name="com.android.music.playstatechanged" />
+ <action android:name="com.android.music.playbackcomplete" />
</intent-filter>
</receiver>
@@ -87,12 +79,9 @@
android:exported="true"
android:enabled="true">
<intent-filter>
- <action
- android:name="com.htc.music.metachanged" />
- <action
- android:name="com.htc.music.playbackcomplete" />
- <action
- android:name="com.htc.music.playstatechanged" />
+ <action android:name="com.htc.music.metachanged" />
+ <action android:name="com.htc.music.playbackcomplete" />
+ <action android:name="com.htc.music.playstatechanged" />
</intent-filter>
</receiver>
@@ -101,12 +90,9 @@
android:exported="true"
android:enabled="true">
<intent-filter>
- <action
- android:name="com.nullsoft.winamp.metachanged" />
- <action
- android:name="com.nullsoft.winamp.playbackcomplete" />
- <action
- android:name="com.nullsoft.winamp.playstatechanged" />
+ <action android:name="com.nullsoft.winamp.metachanged" />
+ <action android:name="com.nullsoft.winamp.playbackcomplete" />
+ <action android:name="com.nullsoft.winamp.playstatechanged" />
</intent-filter>
</receiver>
@@ -115,32 +101,33 @@
android:exported="true"
android:enabled="true">
<intent-filter>
- <action
- android:name="com.real.IMP.metachanged" />
+ <action android:name="com.real.IMP.metachanged" />
<!-- don't know if these two works -->
- <action
- android:name="com.real.IMP.playbackcomplete" />
- <action
- android:name="com.real.IMP.playstatechanged" />
+ <action android:name="com.real.IMP.playbackcomplete" />
+ <action android:name="com.real.IMP.playstatechanged" />
</intent-filter>
</receiver>
-
- <receiver android:name="com.adam.aslfms.receiver.MIUIMusicReceiver"
- android:enabled="true"
- android:exported="true">
+
+ <receiver
+ android:name="com.adam.aslfms.receiver.MIUIMusicReceiver"
+ android:enabled="true"
+ android:exported="true">
<intent-filter>
<action android:name="com.miui.player.metachanged" />
<action android:name="com.miui.player.playstatechanged" />
<action android:name="com.miui.player.playbackcomplete" />
</intent-filter>
</receiver>
-
- <receiver android:name="com.adam.aslfms.receiver.SEMCMusicReceiver"
- android:enabled="true"
- android:exported="true">
+
+ <receiver
+ android:name="com.adam.aslfms.receiver.SEMCMusicReceiver"
+ android:enabled="true"
+ android:exported="true">
<intent-filter>
- <action android:name="com.sonyericsson.music.playbackcontrol.ACTION_PLAYBACK_PLAY" />
- <action android:name="com.sonyericsson.music.playbackcontrol.ACTION_PLAYBACK_PAUSE" />
+ <action
+ android:name="com.sonyericsson.music.playbackcontrol.ACTION_PLAYBACK_PLAY" />
+ <action
+ android:name="com.sonyericsson.music.playbackcontrol.ACTION_PLAYBACK_PAUSE" />
<action android:name="com.sonyericsson.music.TRACK_COMPLETED" />
<action android:name="com.sonyericsson.music.metachanged" />
<action android:name="com.sonyericsson.music.playbackcomplete" />
@@ -162,38 +149,26 @@
android:name="com.adam.aslfms.receiver.SamsungMusicReceiver"
android:exported="true"
android:enabled="true">
- <!-- doesn't work -->
+ <!-- doesn't work -->
<intent-filter>
<action
android:name="com.samsung.sec.android.MusicPlayer.metachanged" />
<action
android:name="com.samsung.sec.android.MusicPlayer.playbackcomplete" />
<action
android:name="com.samsung.sec.android.MusicPlayer.playstatechanged" />
- <action
- android:name="com.samsung.music.metachanged" />
- <action
- android:name="com.samsung.music.playbackcomplete" />
- <action
- android:name="com.samsung.music.playstatechanged" />
- <action
- android:name="com.samsung.sec.metachanged" />
- <action
- android:name="com.samsung.sec.playbackcomplete" />
- <action
- android:name="com.samsung.sec.playstatechanged" />
- <action
- android:name="com.samsung.sec.android.metachanged" />
- <action
- android:name="com.samsung.sec.android.playbackcomplete" />
- <action
- android:name="com.samsung.sec.android.playstatechanged" />
- <action
- android:name="com.samsung.MusicPlayer.metachanged" />
- <action
- android:name="com.samsung.MusicPlayer.playbackcomplete" />
- <action
- android:name="com.samsung.MusicPlayer.playstatechanged" />
+ <action android:name="com.samsung.music.metachanged" />
+ <action android:name="com.samsung.music.playbackcomplete" />
+ <action android:name="com.samsung.music.playstatechanged" />
+ <action android:name="com.samsung.sec.metachanged" />
+ <action android:name="com.samsung.sec.playbackcomplete" />
+ <action android:name="com.samsung.sec.playstatechanged" />
+ <action android:name="com.samsung.sec.android.metachanged" />
+ <action android:name="com.samsung.sec.android.playbackcomplete" />
+ <action android:name="com.samsung.sec.android.playstatechanged" />
+ <action android:name="com.samsung.MusicPlayer.metachanged" />
+ <action android:name="com.samsung.MusicPlayer.playbackcomplete" />
+ <action android:name="com.samsung.MusicPlayer.playstatechanged" />
</intent-filter>
</receiver>
@@ -212,38 +187,15 @@
android:exported="true"
android:enabled="true">
<intent-filter>
- <action
- android:name="com.adam.aslfms.notify.playstatechanged" />
+ <action android:name="com.adam.aslfms.notify.playstatechanged" />
</intent-filter>
</receiver>
- <!--
- - will probably interfere badly with Winamp <receiver
- android:name="com.adam.aslfms.receiver.LastFmAPIReceiver"
- android:exported="true" android:enabled="true">
- <intent-filter> <action
- android:name="fm.last.android.metachanged" /> <action
- android:name="fm.last.android.playbackpaused" /> <action
- android:name="fm.last.android.playbackcomplete" />
- </intent-filter> </receiver>
- -->
+ <!-- - will probably interfere badly with Winamp <receiver android:name="com.adam.aslfms.receiver.LastFmAPIReceiver"
+ android:exported="true" android:enabled="true"> <intent-filter> <action android:name="fm.last.android.metachanged"
+ /> <action android:name="fm.last.android.playbackpaused" /> <action android:name="fm.last.android.playbackcomplete"
+ /> </intent-filter> </receiver> -->
</application>
-
- <supports-screens
- android:smallScreens="true"
- android:normalScreens="true"
- android:largeScreens="false"
- android:anyDensity="false" />
-
- <uses-sdk
- android:minSdkVersion="3"
- android:targetSdkVersion="4" />
-
- <uses-permission
- android:name="android.permission.INTERNET" />
- <uses-permission
- android:name="android.permission.ACCESS_NETWORK_STATE" />
-
</manifest>
View
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Indicates whether an apk should be generated for each density.
-split.density=false
-# Project target.
-target=android-4
-apk-configurations=
View
@@ -3,12 +3,15 @@
#
# This file must be checked in Version Control Systems.
#
-# To customize properties used by the Ant build system use,
+# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
-target=android-4
+target=android-12
apk-configurations=
Deleted file not rendered
Deleted file not rendered
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/text" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorPrimaryInverse"
- android:layout_gravity="left" />
+ android:id="@+id/text"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left" />
View
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item
+ android:id="@+id/menu_about"
+ android:icon="@android:drawable/ic_menu_info_details"
+ android:title="@string/about"/>
+ <item
+ android:id="@+id/menu_whats_new"
+ android:icon="@android:drawable/ic_menu_agenda"
+ android:title="@string/whats_new"/>
+</menu>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item
+ android:id="@+id/menu_scrobble_now"
+ android:icon="@android:drawable/ic_menu_upload"
+ android:title="@string/scrobble_now"/>
+ <item
+ android:id="@+id/menu_clear_cache"
+ android:icon="@android:drawable/ic_menu_close_clear_cancel"
+ android:title="@string/clear_cache"/>
+ <item
+ android:id="@+id/menu_change_sort_order"
+ android:icon="@android:drawable/ic_menu_sort_alphabetically"
+ android:title="@string/sc_sortorder_change"/>
+</menu>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item
+ android:id="@+id/menu_show_scrobble_details"
+ android:icon="@android:drawable/ic_menu_view"
+ android:title="@string/view_sc_details"/>
+ <item
+ android:id="@+id/menu_delete_scrobble"
+ android:icon="@android:drawable/ic_menu_delete"
+ android:title="@string/delete_sc"/>
+</menu>
Oops, something went wrong.

0 comments on commit 66857ef

Please sign in to comment.