Navigation Menu

Skip to content

Commit

Permalink
Update to Android 1.6 API. Improve accessibility with better keyboard…
Browse files Browse the repository at this point in the history 
… control and content descriptions. Fix problems with assigning ringtone to contact on Android 2.0 and later. Update version to 2.4.

git-svn-id: http://ringdroid.googlecode.com/svn/trunk@53 35bc551c-9c80-11dd-979b-47109e308e52
  • Loading branch information
dmazzoni committed Jul 26, 2010
1 parent 80a4dd5 commit a911340
Show file tree
Hide file tree
Showing 17 changed files with 266 additions and 138 deletions.
7 changes: 4 additions & 3 deletions AndroidManifest.xml
View file
Expand Up @@ -21,15 +21,16 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.ringdroid"
android:versionName="2.3"
android:versionCode="20300">
android:versionName="2.4"
android:versionCode="20400">

<uses-sdk android:minSdkVersion="3" />
<uses-sdk android:minSdkVersion="4" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<application android:label="@string/ringdroid_app_name"
android:icon="@drawable/ringdroidlogo">
Expand Down
2 changes: 1 addition & 1 deletion README.txt
View file
Expand Up @@ -36,7 +36,7 @@ in your path. Then run:

rm build.xml
rm -rf bin/
android update project -n ringdroid -t 2 -p .
android update project -n ringdroid -t android-4 -p .

Then, to build:
ant debug
Expand Down
91 changes: 60 additions & 31 deletions res/layout-land/editor.xml
View file
Expand Up @@ -38,18 +38,25 @@
android:layout_height="fill_parent" />

<com.ringdroid.MarkerView android:id="@+id/startmarker"
android:nextFocusDown="@+id/endmarker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/marker_left" />
android:src="@drawable/marker_left"
android:contentDescription="@string/start_marker" />

<com.ringdroid.MarkerView android:id="@+id/endmarker"
android:nextFocusUp="@+id/startmarker"
android:nextFocusDown="@+id/info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/marker_right" />
android:src="@drawable/marker_right"
android:contentDescription="@string/end_marker" />

</AbsoluteLayout>

<TextView android:id="@+id/info"
android:nextFocusUp="@+id/endmarker"
android:nextFocusDown="@+id/play"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="@style/AudioFileInfoOverlayText"
Expand All @@ -58,31 +65,37 @@
<LinearLayout
style="@style/ToolbarBackground"
android:layout_width="fill_parent"
android:layout_height="68px">
android:layout_height="68dip">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="5px"
android:layout_marginRight="5px"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:gravity="center">

<ImageButton android:id="@+id/rew"
android:layout_width="52px"
android:layout_height="52px"
android:nextFocusUp="@+id/info"
android:layout_width="52dip"
android:layout_height="52dip"
style="@android:style/MediaButton"
android:contentDescription="@string/rewind"
android:src="@drawable/ic_media_rew" />

<ImageButton android:id="@+id/play"
android:layout_width="52px"
android:layout_height="52px"
android:nextFocusUp="@+id/info"
android:layout_width="52dip"
android:layout_height="52dip"
style="@android:style/MediaButton"
android:contentDescription="@string/play"
android:src="@drawable/ic_media_play" />

<ImageButton android:id="@+id/ffwd"
android:layout_width="52px"
android:layout_height="52px"
android:nextFocusUp="@+id/info"
android:layout_width="52dip"
android:layout_height="52dip"
style="@android:style/MediaButton"
android:contentDescription="@string/ffwd"
android:src="@drawable/ic_media_ff" />

</LinearLayout>
Expand All @@ -93,18 +106,23 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="5px"
android:layout_marginRight="5px"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:gravity="center">

<ImageButton android:id="@+id/zoom_in"
android:layout_width="52px"
android:layout_height="52px"
android:nextFocusUp="@+id/info"
android:layout_width="52dip"
android:layout_height="52dip"
android:contentDescription="@string/zoom_in"
android:src="@drawable/button_zoom_in" />

<ImageButton android:id="@+id/zoom_out"
android:layout_width="52px"
android:layout_height="52px"
android:nextFocusUp="@+id/info"
android:nextFocusRight="@+id/starttext"
android:layout_width="52dip"
android:layout_height="52dip"
android:contentDescription="@string/zoom_out"
android:src="@drawable/button_zoom_out" />

</LinearLayout>
Expand All @@ -115,49 +133,58 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginTop="6px"
android:layout_marginLeft="5px"
android:layout_marginRight="5px"
android:layout_marginTop="6dip"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/mark_start"
android:nextFocusUp="@+id/info"
android:text="@string/start_label"
android:textColor="#ffffffff"
android:textSize="12sp"
android:textStyle="bold"
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="31px" />
android:layout_height="31dip" />

<TextView
android:id="@+id/mark_end"
android:nextFocusUp="@+id/info"
android:text="@string/end_label"
android:textColor="#ffffffff"
android:textSize="12sp"
android:textStyle="bold"
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="31px" />
android:layout_height="31dip" />

</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center"
android:layout_marginRight="5dip"
android:orientation="vertical">

<EditText android:id="@+id/starttext"
android:nextFocusLeft="@+id/zoom_out"
android:nextFocusRight="@+id/endtext"
android:textSize="11sp"
android:layout_width="70px"
android:layout_height="31px" />
android:layout_width="70dip"
android:layout_height="31dip"
android:contentDescription="@string/start_label" />

<EditText android:id="@+id/endtext"
android:nextFocusLeft="@+id/starttext"
android:nextFocusRight="@+id/save"
android:textSize="11sp"
android:layout_width="70px"
android:layout_height="31px" />
android:layout_width="70dip"
android:layout_height="31dip"
android:contentDescription="@string/end_label" />

</LinearLayout>

Expand All @@ -167,14 +194,16 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="5px"
android:layout_marginRight="5px"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:gravity="center">

<ImageButton android:id="@+id/save"
android:layout_width="52px"
android:layout_height="52px"
android:src="@drawable/menu_save" />
android:nextFocusLeft="@+id/endtext"
android:layout_width="52dip"
android:layout_height="52dip"
android:src="@drawable/menu_save"
android:contentDescription="@string/save_button" />

</LinearLayout>

Expand Down
7 changes: 4 additions & 3 deletions res/layout-land/media_select.xml
View file
Expand Up @@ -30,16 +30,17 @@

<ImageView
android:src="@drawable/search"
android:layout_marginLeft="8px"
android:layout_marginLeft="8dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

<EditText android:id="@+id/search_filter"
android:textSize="18sp"
android:layout_margin="8px"
android:layout_margin="8dip"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_weight="1"
android:contentDescription="@string/search_edit_box">

</EditText>

Expand Down
12 changes: 6 additions & 6 deletions res/layout-land/media_select_row.xml
View file
Expand Up @@ -6,14 +6,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="48px">
android:layout_height="48dip">

<ImageView android:id="@+id/row_icon"
android:gravity="center_vertical"
android:scaleType="center"
android:layout_marginLeft="8px"
android:layout_width="40px"
android:layout_height="48px" />
android:layout_marginLeft="8dip"
android:layout_width="40dip"
android:layout_height="48dip" />

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:gravity="center_vertical"
Expand Down Expand Up @@ -41,7 +41,7 @@
android:gravity="center_vertical"
android:textColor="#ff99ff"
android:textSize="12sp"
android:layout_marginLeft="8px"
android:layout_marginLeft="8dip"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1"/>
Expand All @@ -50,7 +50,7 @@
android:gravity="center_vertical"
android:textColor="#ffff99"
android:textSize="12sp"
android:layout_marginLeft="12px"
android:layout_marginLeft="12dip"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1"/>
Expand Down
4 changes: 2 additions & 2 deletions res/layout/after_save_action.xml
View file
Expand Up @@ -20,8 +20,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="300sp"
android:layout_height="wrap_content"
android:layout_marginBottom="10px"
android:layout_marginRight="10px"
android:layout_marginBottom="10dip"
android:layout_marginRight="10dip"
android:orientation="vertical">

<TextView
Expand Down
4 changes: 2 additions & 2 deletions res/layout/choose_contact.xml
View file
Expand Up @@ -30,13 +30,13 @@

<ImageView
android:src="@drawable/search"
android:layout_marginLeft="8px"
android:layout_marginLeft="8dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

<EditText android:id="@+id/search_filter"
android:textSize="18sp"
android:layout_margin="8px"
android:layout_margin="8dip"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1">
Expand Down
28 changes: 14 additions & 14 deletions res/layout/contact_row.xml
View file
Expand Up @@ -19,37 +19,37 @@

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="64px"
android:layout_marginTop="8px"
android:layout_marginBottom="8px"
android:layout_marginLeft="12px"
android:layout_marginRight="12px">
android:layout_height="64dip"
android:layout_marginTop="8dip"
android:layout_marginBottom="8dip"
android:layout_marginLeft="12dip"
android:layout_marginRight="12dip">

<ImageView android:id="@+id/row_ringtone"
android:gravity="center_vertical"
android:src="@drawable/type_ringtone"
android:layout_marginLeft="4px"
android:layout_marginTop="4px"
android:layout_marginBottom="4px"
android:layout_marginLeft="4dip"
android:layout_marginTop="4dip"
android:layout_marginBottom="4dip"
android:layout_width="wrap_content"
android:layout_height="fill_parent" />

<ImageView android:id="@+id/row_starred"
android:gravity="center_vertical"
android:src="@drawable/star"
android:layout_marginLeft="1px"
android:layout_marginTop="4px"
android:layout_marginBottom="4px"
android:layout_marginRight="3px"
android:layout_marginLeft="1dip"
android:layout_marginTop="4dip"
android:layout_marginBottom="4dip"
android:layout_marginRight="3dip"
android:layout_width="wrap_content"
android:layout_height="fill_parent" />

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginTop="4px"
android:layout_marginBottom="4px">
android:layout_marginTop="4dip"
android:layout_marginBottom="4dip">

<TextView android:id="@+id/row_display_name"
android:gravity="center_vertical"
Expand Down

0 comments on commit a911340

Please sign in to comment.