Merge branch 'jellybean' of git://github.com/freexperia/android_packages_apps_FMRadio.git (66dc57ac) · Commits · e / os / android_packages_apps_FMRadio

AndroidManifest.xml

+12 −6

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.cyanogenmod.fmradio"
		android:versionCode="1"
		android:versionName="1.0">
		android:versionCode="2"
		android:versionName="0.2">

		<uses-sdk
		android:minSdkVersion="14"
		@@ -10,20 +10,26 @@

		<uses-permission android:name="com.stericsson.permission.FM_RADIO_TRANSMITTER"/>
		<uses-permission android:name="com.stericsson.permission.FM_RADIO_RECEIVER"/>
		<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

		<application
		android:icon="@drawable/radio"
		android:theme="@style/fmapp_style"
		android:label="@string/app_name">
		<activity
		android:name=".screens.FmRadioReceiver"
		android:label="@string/app_name">
		android:name=".screens.BandSelectionScreen"
		android:noHistory="true"
		android:configChanges="keyboard\|orientation\|screenSize\|screenLayout">
		<intent-filter>
		<action android:name="android.intent.action.MAIN"/>
		<category android:name="android.intent.category.LAUNCHER"/>
		</intent-filter>
		</activity>
		</application>

		<activity
		android:name=".screens.FmRadioReceiver"
		android:label="@string/app_name"
		android:configChanges="keyboard\|screenSize\|orientation\|screenLayout"/>
		<activity android:name=".screens.PreferencesScreen"/>

		</application>
		</manifest>

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ To-Do list
		* Add resolution independent resources
		* Add notification bar support
		* Add Launcher Widget ?
		* Fix (mono/stereo) display
		* Add Preferences
		* Add About
		* Implement earplugs onStart verification
		No newline at end of file
		* Restore play after call
		* Implement ability to play trough device speakers
		No newline at end of file

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<TextView
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/band_select_title"
		android:layout_margin="@dimen/default_padding"/>


		<RadioGroup
		android:id="@+id/rg_band"
		android:layout_margin="@dimen/default_padding"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1">

		<RadioButton
		android:id="@+id/rb_usa"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:checked="true"
		android:text="@string/band_us" />

		<RadioButton
		android:id="@+id/rb_eu"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/band_eu" />

		<RadioButton
		android:id="@+id/rb_ch"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/band_ch" />

		<RadioButton
		android:id="@+id/rb_ja"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/band_ja" />

		</RadioGroup>


		<Button
		android:id="@+id/btn_next"
		android:layout_margin="@dimen/default_padding"
		android:layout_width="match_parent"

		android:layout_height="wrap_content"
		android:text="@string/proceed" />


		</LinearLayout>
		No newline at end of file

+13 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,10 @@
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="app_name">FM Radio</string>
		<string name="band_select">Select Band</string>
		<string name="band_us">U.S</string>
		<string name="band_select_title">Please select your FM region:\n(this screen will only be shown once, but you
		can change this value later from the preferences menu.)</string>
		<string name="proceed">Proceed</string>
		<string name="band_us">U.S.</string>
		<string name="band_eu">Europe</string>
		<string name="band_ja">Japan</string>
		<string name="band_ch">China</string>
		@@ -34,4 +37,13 @@
		<string name="unable_to_start_radio">Unable to start the radio receiver.</string>
		<string name="unable_to_mediaplayer">Unable to start Android\'s MediaPlayer</string>
		<string name="mediaplayer_busy">MediaPlayer busy. Please wait and try again.</string>
		<string name="earplugs_not_connected">Earplugs must be plugged in to use this application!</string>

		<!-- Preferences -->
		<string name="preferences">Preferences</string>
		<string name="pref_notification_bar_title">Use Notification Control</string>
		<string name="pref_print_debug_info_title">Output verbose logcat</string>

		<!-- About -->
		<string name="about">About</string>
		</resources>

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
		<PreferenceCategory android:title="@string/preferences">

		<CheckBoxPreference
		android:key="use_notification_bar"
		android:title="@string/pref_notification_bar_title"
		android:defaultValue="true"/>


		<CheckBoxPreference
		android:key="print_debug_info"
		android:title="@string/pref_print_debug_info_title"
		android:defaultValue="false"/>


		<PreferenceScreen
		android:title="@string/about">
		<intent android:action="android.intent.action.FM_ABOUT"/>
		</PreferenceScreen>

		</PreferenceCategory>
		</PreferenceScreen>
		No newline at end of file