[npr-android-app] 4 new revisions pushed by justinfr...@gmail.com on 2012-07-17 23:24 GMT

[npr-and...@googlecode.com]

4 new revisions:

Revision: 434515b9c876
Author: Carmello <Carmello@Lucile>
Date: Fri May 11 20:03:52 2012
Log: s
http://code.google.com/p/npr-android-app/source/detail?r=434515b9c876

Revision: 594e74b69029
Author: unknown <Carmello@Lucile.(none)>
Date: Thu May 17 20:29:44 2012
Log: added accessibiliy content descriptions and physical key
navigation
http://code.google.com/p/npr-android-app/source/detail?r=594e74b69029

Revision: 67e7dc02dfa8
Author: Justin Friberg <justin...@gmail.com>
Date: Tue Jul 17 16:02:43 2012
Log: Add stop button to accessibility content descriptions
http://code.google.com/p/npr-android-app/source/detail?r=67e7dc02dfa8

Revision: f181c9c890d7
Author: Justin Friberg <justin...@gmail.com>
Date: Tue Jul 17 16:17:22 2012
Log: Put back in transparent background in play/pause button
http://code.google.com/p/npr-android-app/source/detail?r=f181c9c890d7

==============================================================================
Revision: 434515b9c876
Author: Carmello <Carmello@Lucile>
Date: Fri May 11 20:03:52 2012
Log: s

http://code.google.com/p/npr-android-app/source/detail?r=434515b9c876

Modified:
/Npr/res/layout/main.xml

=======================================
--- /Npr/res/layout/main.xml Mon Apr 30 18:44:34 2012
+++ /Npr/res/layout/main.xml Fri May 11 20:03:52 2012
@@ -20,6 +20,8 @@
android:layout_marginRight="20dip"
android:src="@drawable/search_button"
android:background="@android:color/transparent"
+ android:contentDescription="@string/acd_search_button"
+
/>

<ImageButton

==============================================================================
Revision: 594e74b69029
Author: unknown <Carmello@Lucile.(none)>
Date: Thu May 17 20:29:44 2012
Log: added accessibiliy content descriptions and physical key
navigation

http://code.google.com/p/npr-android-app/source/detail?r=594e74b69029

Deleted:
/Npr_Test/default.properties
Modified:
/Npr/res/layout/news_story.xml
/Npr/res/layout/player_contracted.xml
/Npr/res/layout/player_expanded.xml
/Npr/res/layout/program_action_buttons.xml
/Npr/res/layout/search.xml
/Npr/res/layout/search_box.xml
/Npr/res/values/strings.xml
/Npr/src/org/npr/android/news/PlaylistView.java
/Npr_Test/.classpath

=======================================
--- /Npr_Test/default.properties Sun May 22 12:54:47 2011
+++ /dev/null
@@ -1,11 +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.
-
-# Project target.
-target=android-4
=======================================
--- /Npr/res/layout/news_story.xml Sun Sep 11 10:17:14 2011
+++ /Npr/res/layout/news_story.xml Thu May 17 20:29:44 2012
@@ -11,14 +11,13 @@
android:id="@+id/NewsStoryLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:id="@+id/NewsStoryIndex"
android:gravity="right"
- android:layout_alignParentRight="true"
style="@style/NewsStoryIndex"/>
<TextView
android:layout_height="wrap_content"
@@ -52,7 +51,8 @@
android:layout_weight="1"
android:drawableLeft="@drawable/share"
android:text="@string/msg_share"
- android:background="@drawable/story_button_background"/>
+ android:background="@drawable/story_button_background"
+ android:nextFocusRight="@+id/NewsStoryListenNowButton"/>
<Button
android:id="@+id/NewsStoryListenNowButton"
android:layout_width="wrap_content"
@@ -61,7 +61,9 @@
android:layout_weight="1"
android:drawableLeft="@drawable/speaker_icon"
android:text="@string/msg_listen_now"
- android:background="@drawable/story_button_background"/>
+ android:background="@drawable/story_button_background"
+ android:nextFocusLeft="@+id/NewsStoryShareButton"
+ android:nextFocusRight="@+id/NewsStoryListenEnqueueButton"/>
<Button
android:id="@+id/NewsStoryListenEnqueueButton"
android:layout_width="wrap_content"
@@ -69,7 +71,8 @@
android:layout_weight="1"
android:drawableLeft="@drawable/plus"
android:text="@string/msg_listen_later"
- android:background="@drawable/story_button_background"/>
+ android:background="@drawable/story_button_background"
+ android:nextFocusLeft="@+id/NewsStoryListenNowButton"/>
</LinearLayout>
<FrameLayout
android:layout_width="fill_parent"
@@ -77,7 +80,8 @@
<WebView
android:id="@+id/NewsStoryWebView"
android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_width="fill_parent"
+ android:contentDescription="@string/acd_news_story_text">
</WebView>
</FrameLayout>
</LinearLayout>
=======================================
--- /Npr/res/layout/player_contracted.xml Sun May 22 12:54:47 2011
+++ /Npr/res/layout/player_contracted.xml Thu May 17 20:29:44 2012
@@ -19,7 +19,8 @@
android:layout_alignParentBottom="true"
android:layout_margin="15dip"
android:src="@drawable/play_button_normal"
- android:background="@android:color/transparent"/>
+ android:background="@android:color/transparent"
+ android:contentDescription="@string/acd_play_button"/>
<TextView
android:id="@+id/contracted_status"
android:layout_toRightOf="@id/contracted_play_pause"
=======================================
--- /Npr/res/layout/player_expanded.xml Sun May 22 12:54:47 2011
+++ /Npr/res/layout/player_expanded.xml Thu May 17 20:29:44 2012
@@ -1,122 +1,143 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/player_expanded"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
- android:visibility="gone">
- <ImageView
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/player_expanded"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:src="@drawable/drag_handle_down"
- android:id="@+id/drag_handle_down"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:background="@drawable/drag_handle_background"/>
- <TextView
- android:id="@+id/status"
- android:layout_below="@id/drag_handle_down"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginLeft="25dip"
- android:layout_marginTop="5dip"
- android:textAppearance="@style/PlayerStatusText"/>
- <TextView
- android:id="@+id/news_item_text"
- android:layout_below="@id/status"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginLeft="25dip"
- android:layout_marginRight="25dip"
- android:layout_marginTop="2dip"
- android:lines="1"
- android:ellipsize="end"
- android:textAppearance="@style/PlayerText"/>
- <ProgressBar
- android:id="@+id/player_loading_indicator"
- android:layout_width="10dp"
- android:layout_height="10dp"
- android:visibility="invisible"
- android:layout_below="@id/status"
- android:layout_alignParentRight="true"
- android:layout_marginTop="5dip"
- android:layout_marginRight="5dip"
- style="@android:style/Widget.ProgressBar.Small"
- />
- <ImageView
- android:id="@+id/separator"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/news_item_text"
- android:layout_marginTop="3dip"
- android:src="@drawable/expanded_player_divider"
- android:scaleType="fitXY"
- android:background="#000000"/>
- <LinearLayout
- android:id="@+id/progress_row"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/separator"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="15dip">
- <SeekBar
- android:id="@+id/stream_progress_bar"
- android:layout_width="fill_parent"
- android:layout_height="30dip"
- android:layout_weight="1"
- android:max="100"
- android:progressDrawable="@drawable/seekbar"
- android:thumbOffset="1px"
- android:thumb="@drawable/thumb"/>
+ android:layout_height="fill_parent"
+ android:visibility="gone" >
+
+ <ImageView
+ android:id="@+id/drag_handle_down"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:background="@drawable/drag_handle_background"
+ android:src="@drawable/drag_handle_down" />
+
<TextView
- android:id="@+id/stream_length_display_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_marginLeft="5dip"
- android:textAppearance="@style/PlayerText"/>
- </LinearLayout>
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/progress_row"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:layout_marginLeft="25dip"
- android:layout_marginRight="25dip">
- <ImageButton
- android:id="@+id/stream_rewind_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:src="@drawable/rew_normal"
- android:scaleType="centerInside"
- android:background="@android:color/transparent"/>
- <ImageButton
- android:id="@+id/stream_rewind_30_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:src="@drawable/rew_30_normal"
- android:scaleType="centerInside"
- android:background="@android:color/transparent"/>
- <ImageButton
- android:id="@+id/stream_play_pause_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:src="@drawable/play_button_normal"
- android:scaleType="centerInside"
- android:background="@android:color/transparent"/>
- <ImageButton
- android:id="@+id/stream_fastforward_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:src="@drawable/ffwd_normal"
- android:scaleType="centerInside"
- android:background="@android:color/transparent"/>
- </LinearLayout>
+ android:id="@+id/status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/drag_handle_down"
+ android:layout_marginLeft="25dip"
+ android:layout_marginTop="5dip"
+ android:textAppearance="@style/PlayerStatusText" />
+
+ <TextView
+ android:id="@+id/news_item_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/status"
+ android:layout_marginLeft="25dip"
+ android:layout_marginRight="25dip"
+ android:layout_marginTop="2dip"
+ android:ellipsize="end"
+ android:lines="1"
+ android:textAppearance="@style/PlayerText" />
+
+ <ProgressBar
+ android:id="@+id/player_loading_indicator"
+ style="@android:style/Widget.ProgressBar.Small"
+ android:layout_width="10dp"
+ android:layout_height="10dp"
+ android:layout_alignParentRight="true"
+ android:layout_below="@id/status"
+ android:layout_marginRight="5dip"
+ android:layout_marginTop="5dip"
+ android:visibility="invisible" />
+
+ <ImageView
+ android:id="@+id/separator"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/news_item_text"
+ android:layout_marginTop="3dip"
+ android:background="#000000"
+ android:scaleType="fitXY"
+ android:src="@drawable/expanded_player_divider" />
+
+ <LinearLayout
+ android:id="@+id/progress_row"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/separator"
+ android:layout_marginLeft="15dip"
+ android:layout_marginRight="15dip"
+ android:gravity="center_vertical"
+ android:orientation="horizontal" >
+
+ <SeekBar
+ android:id="@+id/stream_progress_bar"
+ android:layout_width="fill_parent"
+ android:layout_height="30dip"
+ android:layout_weight="1"
+ android:max="100"
+ android:progressDrawable="@drawable/seekbar"
+ android:thumb="@drawable/thumb"
+ android:thumbOffset="1px" />
+
+ <TextView
+ android:id="@+id/stream_length_display_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_marginLeft="5dip"
+ android:textAppearance="@style/PlayerText" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/progress_row"
+ android:layout_marginLeft="25dip"
+ android:layout_marginRight="25dip"
+ android:gravity="center_vertical"
+ android:orientation="horizontal" >
+
+ <ImageButton
+ android:id="@+id/stream_rewind_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@android:color/transparent"
+ android:contentDescription="@string/acd_stream_rewind_button"
+ android:scaleType="centerInside"
+ android:src="@drawable/rew_normal"
+ android:nextFocusRight="@+id/stream_rewind_30_button" />
+
+ <ImageButton
+ android:id="@+id/stream_rewind_30_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@android:color/transparent"
+
android:contentDescription="@string/acd_stream_rewind_30_button"
+ android:scaleType="centerInside"
+ android:src="@drawable/rew_30_normal"
+ android:nextFocusLeft="@+id/stream_rewind_button"
+ android:nextFocusRight="@+id/stream_play_pause_button" />
+
+ <ImageButton
+ android:id="@+id/stream_play_pause_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:contentDescription="@string/acd_play_button"
+ android:scaleType="centerInside"
+ android:src="@drawable/play_button_normal"
+ android:nextFocusLeft="@+id/stream_rewind_30_button"
+ android:nextFocusRight="@+id/stream_fastforward_button" />
+
+ <ImageButton
+ android:id="@+id/stream_fastforward_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@android:color/transparent"
+
android:contentDescription="@string/acd_stream_fast_forward_button"
+ android:scaleType="centerInside"
+ android:src="@drawable/ffwd_normal"
+ android:nextFocusLeft="@+id/stream_play_pause_button" />
+ </LinearLayout>
+
</RelativeLayout>
=======================================
--- /Npr/res/layout/program_action_buttons.xml Sun May 22 12:54:47 2011
+++ /Npr/res/layout/program_action_buttons.xml Thu May 17 20:29:44 2012
@@ -8,6 +8,7 @@
android:padding="10dip"
android:background="@drawable/app_title_background"
android:orientation="horizontal"
+
>
<Button
android:id="@+id/add_all_to_playlist"
=======================================
--- /Npr/res/layout/search.xml Sun May 22 12:54:47 2011
+++ /Npr/res/layout/search.xml Thu May 17 20:29:44 2012
@@ -1,82 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
-
- <LinearLayout
- android:orientation="vertical"
- android:padding="10dip"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/msg_search_term"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
- <LinearLayout
- android:layout_height="wrap_content"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <LinearLayout
android:layout_width="fill_parent"
- android:orientation="horizontal">
- <EditText
- android:id="@+id/SearchText"
- android:background="@drawable/textfield_search"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingTop="10dip"
- android:layout_weight="1"
- android:hint="@string/msg_search_hint"
- android:imeOptions="actionSearch"
- android:inputType="text"/>
- <ImageButton
- android:id="@+id/search_go_button"
- android:background="@drawable/btn_search_dialog"
- android:src="@drawable/ic_btn_search"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- />
- </LinearLayout>
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="10dip" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/msg_search_term"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal" >
+
+ <EditText
+ android:id="@+id/SearchText"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@drawable/textfield_search"
+ android:hint="@string/msg_search_hint"
+ android:imeOptions="actionSearch"
+ android:inputType="text"
+ android:nextFocusRight="@+id/search_go_button"
+ android:paddingTop="10dip" />
+
+ <ImageButton
+ android:id="@+id/search_go_button"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:background="@drawable/btn_search_dialog"
+ android:contentDescription="@string/acd_search_button"
+ android:nextFocusRight="@+id/StartDateButton"
+ android:nextFocusLeft="@+id/SearchText"
+ android:src="@drawable/ic_btn_search" />
+ </LinearLayout>
</LinearLayout>

<include layout="@layout/divider" />

<TableLayout
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:stretchColumns="1"
- android:padding="10dip">
-
- <TableRow
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_width="fill_parent">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="right"
- android:text="@string/msg_search_start_date"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dip"
- android:id="@+id/StartDateButton"/>
- </TableRow>
- <TableRow
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="12dip">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="right"
- android:text="@string/msg_search_end_date"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dip"
- android:id="@+id/EndDateButton"/>
- </TableRow>
+ android:padding="10dip"
+ android:stretchColumns="1" >
+
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="@string/msg_search_start_date"
+
android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <Button
+ android:id="@+id/StartDateButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dip"
+ android:contentDescription="@string/acd_start_date"
+ android:nextFocusRight="@+id/EndDateButton"
+ android:nextFocusLeft="@+id/search_go_button" />
+ </TableRow>
+
+ <TableRow
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="12dip" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="@string/msg_search_end_date"
+
android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <Button
+ android:id="@+id/EndDateButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dip"
+ android:contentDescription="@string/acd_end_date"
+ android:nextFocusLeft="@+id/StartDateButton"
+ android:nextFocusRight="@+id/SearchText" />
+ </TableRow>
</TableLayout>
- </LinearLayout>
+
+</LinearLayout>
=======================================
--- /Npr/res/layout/search_box.xml Sun May 22 12:54:47 2011
+++ /Npr/res/layout/search_box.xml Thu May 17 20:29:44 2012
@@ -11,12 +11,16 @@
android:layout_weight="1"
android:hint="@string/msg_search_hint"
android:imeOptions="actionSearch"
- android:inputType="text"/>
+ android:inputType="text"
+ android:nextFocusRight="@+id/search_go_button"
+ />
<ImageButton
android:id="@+id/search_go_button"
android:background="@drawable/btn_search_dialog"
android:src="@drawable/ic_btn_search"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
+ android:contentDescription="@string/acd_search_button"
+ android:nextFocusLeft="@+id/SearchText"
/>
</LinearLayout>
=======================================
--- /Npr/res/values/strings.xml Mon Apr 30 18:44:34 2012
+++ /Npr/res/values/strings.xml Thu May 17 20:29:44 2012
@@ -170,4 +170,16 @@
<item>Other</item>
</array>
<string name="banner_support">support\ncomes from</string>
+
+ <!-- Accessibility String Values -->
+ <string name="acd_about">About NPR</string>
+ <string name="acd_search_button">Search Button</string>
+ <string name="acd_play_button">Play</string>
+ <string name="acd_pause_button">Pause</string>
+ <string name="acd_stream_rewind_button">Stream Rewind</string>
+ <string name="acd_stream_rewind_30_button">Thirty Second Stream
Rewind</string>
+ <string name="acd_stream_fast_forward_button">Fast Forward
Stream</string>
+ <string name="acd_news_story_text">News Story Text</string>
+ <string name="acd_start_date">Start Date</string>
+ <string name="acd_end_date">End Date</string>
</resources>
=======================================
--- /Npr/src/org/npr/android/news/PlaylistView.java Mon Apr 30 18:44:34 2012
+++ /Npr/src/org/npr/android/news/PlaylistView.java Thu May 17 20:29:44 2012
@@ -496,6 +496,7 @@
if (isPlaying) {
if (storedPlayable == null || !storedPlayable.isStream()) {

playPauseButton.setImageResource(R.drawable.pause_button_normal);
+
playPauseButton.setContentDescription(getResources().getString(R.string.acd_pause_button));

contractedPlayButton.setImageResource(R.drawable.pause_button_normal);
} else {

playPauseButton.setImageResource(R.drawable.stop_button_normal);
@@ -504,7 +505,8 @@
playPauseShowsPlay = false;
} else {
playPauseButton.setImageResource(R.drawable.play_button_normal);
-
contractedPlayButton.setImageResource(R.drawable.play_button_normal);
+
playPauseButton.setContentDescription(getResources().getString(R.string.acd_play_button));
+
contractedPlayButton.setImageResource(R.drawable.play_button_normal);
playPauseShowsPlay = true;
}
}
=======================================
--- /Npr_Test/.classpath Sun May 22 12:54:47 2011
+++ /Npr_Test/.classpath Thu May 17 20:29:44 2012
@@ -4,5 +4,5 @@
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con"
path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry combineaccessrules="false" kind="src" path="/Npr"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="bin/classes"/>
</classpath>

==============================================================================
Revision: 67e7dc02dfa8
Author: Justin Friberg <justin...@gmail.com>
Date: Tue Jul 17 16:02:43 2012
Log: Add stop button to accessibility content descriptions

http://code.google.com/p/npr-android-app/source/detail?r=67e7dc02dfa8

Modified:
/Npr/Npr.iml
/Npr/res/values/strings.xml
/Npr/src/org/npr/android/news/PlaylistView.java
/Npr_Test/Npr_Test.iml

=======================================
--- /Npr/Npr.iml Wed Apr 25 14:01:45 2012
+++ /Npr/Npr.iml Tue Jul 17 16:02:43 2012
@@ -20,6 +20,11 @@
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
<option name="GENERATE_UNSIGNED_APK" value="false" />
<option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
+ <option name="PACK_TEST_CODE" value="false" />
+ <option name="RUN_PROGUARD" value="false" />
+ <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
+ <resOverlayFolders />
+ <includeSystemProguardFile>false</includeSystemProguardFile>
</configuration>
</facet>
</component>
=======================================
--- /Npr/res/values/strings.xml Thu May 17 20:29:44 2012
+++ /Npr/res/values/strings.xml Tue Jul 17 16:02:43 2012
@@ -176,6 +176,7 @@
<string name="acd_search_button">Search Button</string>
<string name="acd_play_button">Play</string>
<string name="acd_pause_button">Pause</string>
+ <string name="acd_stop_button">Stop</string>
<string name="acd_stream_rewind_button">Stream Rewind</string>
<string name="acd_stream_rewind_30_button">Thirty Second Stream
Rewind</string>
<string name="acd_stream_fast_forward_button">Fast Forward
Stream</string>
=======================================
--- /Npr/src/org/npr/android/news/PlaylistView.java Thu May 17 20:29:44 2012
+++ /Npr/src/org/npr/android/news/PlaylistView.java Tue Jul 17 16:02:43 2012
@@ -496,10 +496,11 @@
if (isPlaying) {
if (storedPlayable == null || !storedPlayable.isStream()) {

playPauseButton.setImageResource(R.drawable.pause_button_normal);
-
playPauseButton.setContentDescription(getResources().getString(R.string.acd_pause_button));
+
playPauseButton.setContentDescription(getResources().getString(R.string.acd_pause_button));

contractedPlayButton.setImageResource(R.drawable.pause_button_normal);
} else {

playPauseButton.setImageResource(R.drawable.stop_button_normal);
+
playPauseButton.setContentDescription(getResources().getString(R.string.acd_stop_button));

contractedPlayButton.setImageResource(R.drawable.stop_button_normal);
}
playPauseShowsPlay = false;
=======================================
--- /Npr_Test/Npr_Test.iml Wed Apr 25 14:01:45 2012
+++ /Npr_Test/Npr_Test.iml Tue Jul 17 16:02:43 2012
@@ -20,6 +20,11 @@
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
<option name="GENERATE_UNSIGNED_APK" value="false" />
<option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
+ <option name="PACK_TEST_CODE" value="false" />
+ <option name="RUN_PROGUARD" value="false" />
+ <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
+ <resOverlayFolders />
+ <includeSystemProguardFile>false</includeSystemProguardFile>
</configuration>
</facet>
</component>

==============================================================================
Revision: f181c9c890d7
Author: Justin Friberg <justin...@gmail.com>
Date: Tue Jul 17 16:17:22 2012
Log: Put back in transparent background in play/pause button

http://code.google.com/p/npr-android-app/source/detail?r=f181c9c890d7

Modified:
/Npr/res/layout/player_expanded.xml

=======================================
--- /Npr/res/layout/player_expanded.xml Thu May 17 20:29:44 2012
+++ /Npr/res/layout/player_expanded.xml Tue Jul 17 16:17:22 2012
@@ -122,6 +122,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:background="@android:color/transparent"
android:contentDescription="@string/acd_play_button"
android:scaleType="centerInside"
android:src="@drawable/play_button_normal"