Rename Settings Activity in RSSfeed example

vogella · vogella · commit 6ee89b908f67 · 2014-02-24T15:00:06.000+01:00
diff --git a/com.example.android.rssfeed/AndroidManifest.xml b/com.example.android.rssfeed/AndroidManifest.xml
@@ -28,7 +28,7 @@
             android:name=".DetailActivity"
             android:label="Details" >
         </activity>
-        <activity android:name="MyPreferenceActivity" >
+        <activity android:name="SettingsActivity" >
         </activity>
 
         <service android:name="RssDownloadService" >
diff --git a/com.example.android.rssfeed/src/com/example/android/rssfeed/MyListFragment.java b/com.example.android.rssfeed/src/com/example/android/rssfeed/MyListFragment.java
@@ -11,7 +11,6 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 
 import com.example.android.rssfeedlibrary.RssItem;
@@ -40,8 +39,6 @@ public void onCreate(Bundle savedInstanceState) {
 	@Override
 	public void onResume() {
 		super.onResume();
-		MyAdapter adapter = (MyAdapter) getListAdapter();
-		adapter.notifyDataSetChanged();
 		getActivity().registerReceiver(receiver,
 				new IntentFilter(RssDownloadService.NOTIFICATION));
 	}
@@ -65,9 +62,11 @@ public void updateListContent() {
 	}
 
 	public void setListContent(List<RssItem> result) {
-		ArrayAdapter listAdapter = (ArrayAdapter) getListAdapter();
+		@SuppressWarnings("unchecked")
+		ArrayAdapter<RssItem> listAdapter = (ArrayAdapter<RssItem>) getListAdapter();
 		listAdapter.clear();
 		listAdapter.addAll(result);
+		
 	}
 
 	public interface OnItemSelectedListener {
diff --git a/com.example.android.rssfeed/src/com/example/android/rssfeed/RssDownloadService.java b/com.example.android.rssfeed/src/com/example/android/rssfeed/RssDownloadService.java
@@ -24,5 +24,4 @@ protected void onHandleIntent(Intent intent) {
 		Intent i = new Intent(NOTIFICATION);
 		sendBroadcast(i);		
 	}
-
 }
diff --git a/com.example.android.rssfeed/src/com/example/android/rssfeed/RssfeedActivity.java b/com.example.android.rssfeed/src/com/example/android/rssfeed/RssfeedActivity.java
@@ -4,7 +4,6 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -15,17 +14,11 @@ public class RssfeedActivity extends Activity implements
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		// StrictMode.ThreadPolicy policy = new
-		// StrictMode.ThreadPolicy.Builder()
-		// .permitAll().build();
-		// StrictMode.setThreadPolicy(policy);
-
 		setContentView(R.layout.activity_rssfeed);
 	}
 	
 	@Override
 	protected void onRestoreInstanceState(Bundle savedInstanceState) {
-		// TODO Auto-generated method stub
 		super.onRestoreInstanceState(savedInstanceState);
 	}
 	
@@ -53,7 +46,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			fragment.updateListContent();
 			break;
 		case R.id.action_settings:
-			Intent intent = new Intent(this, MyPreferenceActivity.class);
+			Intent intent = new Intent(this, SettingsActivity.class);
 			startActivity(intent);
 			break;
 		default:
diff --git a/com.example.android.rssfeed/src/com/example/android/rssfeed/SettingsActivity.java b/com.example.android.rssfeed/src/com/example/android/rssfeed/SettingsActivity.java
@@ -9,7 +9,7 @@
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 
-public class MyPreferenceActivity extends PreferenceActivity implements
+public class SettingsActivity extends PreferenceActivity implements
 		OnSharedPreferenceChangeListener {
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,4 @@ protected void onHandleIntent(Intent intent) {`
`24`	`24`	`Intent i = new Intent(NOTIFICATION);`
`25`	`25`	`sendBroadcast(i);`
`26`	`26`	`}`
`27`		`-`
`28`	`27`	`}`