ricky/location_ringer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Feature/#50'

Browse Source
This commit is contained in:
Ricky Barrette
2012-05-25 11:42:05 -04:00
parent 95d3536887 0ac2e80c3d
commit 9e559d445e
6 changed files with 296 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LocationRinger/res/layout/fragment_container.xml
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</ScrollView>

29
LocationRinger/res/layout/fragment_list_contianer.xml
View File

@@ -1,12 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="match_parent" >
<LinearLayout
android:id="@+id/fragment_list_contianer"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/add_feature_button"
android:layout_alignParentTop="true"
android:paddingBottom="5dip" >
<LinearLayout
android:id="@+id/fragment_list_contianer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</ScrollView>
<ImageButton
android:id="@id/add_feature_button"
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@android:drawable/ic_menu_add" />
</ScrollView>
</RelativeLayout>

6
LocationRinger/res/values/features.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="features">
<item>@string/ringtone</item>
<item>@string/notification_ringtone</item>
@@ -7,7 +8,6 @@
<item>@string/music_volume</item>
<item>@string/bluetooth</item>
<item>@string/wifi</item>
<item>@string/update_interval</item>
</string-array>
</resources>
</resources>