Skip to content

Commit 55c6563

Browse files
vogellavogella
committed
Updates the Android examples
1 parent 92c73c2 commit 55c6563

File tree

18 files changed

+160
-154
lines changed

18 files changed

+160
-154
lines changed

‎com.example.android.rssfeed/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.example.android.rssfeed"
33
android:versionCode="1"
4-
android:versionName="1.0" >
4+
android:versionName="1.1" >
55

66
<uses-sdk
77
android:minSdkVersion="16"

‎com.example.android.rssfeed/res/xml/mypreferences.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
android:key="url"
66
android:title="Rss feed URL"
77
android:inputType="textUri"/>
8+
<CheckBoxPreference android:title="Aktiv" android:key="active"/>
89

910
</PreferenceScreen>

‎com.example.android.rssfeed/src/com/example/android/rssfeed/DetailFragment.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
1919
}
2020

2121
public void setText(String item) {
22+
// Set the scale factor
2223
webview.setInitialScale(50);
24+
webview.getSettings().setBuiltInZoomControls(true);
25+
webview.getSettings().setSupportZoom(true);
2326
webview.loadUrl(item);
2427
}
2528
}

‎com.example.android.rssfeed/src/com/example/android/rssfeed/RssApplication.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public void onLowMemory() {
1616
}
1717
@Override
1818
public void onTrimMemory(int level) {
19-
// TODO Auto-generated method stub
2019
super.onTrimMemory(level);
2120
}
2221

‎com.example.android.rssfeed/src/com/example/android/rssfeed/SettingsActivity.java‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,55 +9,12 @@
99
import android.preference.PreferenceActivity;
1010
import android.preference.PreferenceCategory;
1111

12-
public class SettingsActivity extends PreferenceActivity implements
13-
OnSharedPreferenceChangeListener {
12+
public class SettingsActivity extends PreferenceActivity {
1413

1514
@Override
1615
public void onCreate(Bundle savedInstanceState) {
1716
super.onCreate(savedInstanceState);
1817
addPreferencesFromResource(R.xml.mypreferences);
19-
20-
// show the current value in the settings screen
21-
for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
22-
initSummary(getPreferenceScreen().getPreference(i));
23-
}
2418
}
2519

26-
@Override
27-
protected void onResume() {
28-
super.onResume();
29-
getPreferenceScreen().getSharedPreferences()
30-
.registerOnSharedPreferenceChangeListener(this);
31-
}
32-
33-
@Override
34-
protected void onPause() {
35-
super.onPause();
36-
getPreferenceScreen().getSharedPreferences()
37-
.unregisterOnSharedPreferenceChangeListener(this);
38-
}
39-
40-
@Override
41-
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
42-
String key) {
43-
updatePreferences(findPreference(key));
44-
}
45-
46-
private void initSummary(Preference p) {
47-
if (p instanceof PreferenceCategory) {
48-
PreferenceCategory cat = (PreferenceCategory) p;
49-
for (int i = 0; i < cat.getPreferenceCount(); i++) {
50-
initSummary(cat.getPreference(i));
51-
}
52-
} else {
53-
updatePreferences(p);
54-
}
55-
}
56-
57-
private void updatePreferences(Preference p) {
58-
if (p instanceof EditTextPreference) {
59-
EditTextPreference editTextPref = (EditTextPreference) p;
60-
p.setSummary(editTextPref.getText());
61-
}
62-
}
6320
}

‎com.vogella.android.customview.textview/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
3+
org.eclipse.jdt.core.compiler.compliance=1.6
4+
org.eclipse.jdt.core.compiler.source=1.6

‎com.vogella.android.customview.textview/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-18
14+
target=android-19

‎com.vogella.android.fragment.dialog/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-17
14+
target=android-18

‎com.vogella.android.spinner.test/src/com/android/example/spinner/test/SpinnerActivityTest.java‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212

1313
public class SpinnerActivityTest extends
1414
ActivityInstrumentationTestCase2<SpinnerActivity> {
15-
public static final int TEST_STATE_DESTROY_POSITION = 2;
16-
public static final String TEST_STATE_DESTROY_SELECTION = "Earth";
17-
18-
public static final int TEST_STATE_PAUSE_POSITION = 4;
19-
public static final String TEST_STATE_PAUSE_SELECTION = "Jupiter";
2015

2116
private SpinnerActivity mActivity;
2217
private Spinner mSpinner;
@@ -43,41 +38,18 @@ protected void setUp() throws Exception {
4338

4439
public void testPreConditions() {
4540
assertTrue(mSpinner.getOnItemSelectedListener() != null);
46-
assertTrue(mPlanetData != null);
41+
assertNotNull(mPlanetData);
4742
assertTrue(mPlanetData.getCount() > 0);
4843
} // end of testPreConditions() method definition
4944

50-
public void testSpinnerSelection() {
51-
mActivity.runOnUiThread(new Runnable() {
52-
public void run() {
53-
mSpinner.requestFocus();
54-
mSpinner.setSelection(0);
55-
}
56-
});
57-
int count = mPlanetData.getCount();
58-
int testposition = count % 2;
59-
this.sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
60-
for (int i = 1; i <= testposition; i++) {
61-
this.sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
62-
}
63-
64-
this.sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
65-
66-
// Ensure that the text is not empty
67-
int mPos = mSpinner.getSelectedItemPosition();
68-
String mSelection = (String) mSpinner.getItemAtPosition(mPos);
69-
70-
// Compare selection in the Spinner with the text view
71-
TextView resultView = (TextView) mActivity
72-
.findViewById(com.android.example.spinner.R.id.SpinnerResult);
73-
74-
String resultText = (String) resultView.getText();
75-
76-
assertEquals(resultText, mSelection);
77-
}
45+
public static final int TEST_STATE_DESTROY_POSITION = 2;
46+
public static final String TEST_STATE_DESTROY_SELECTION = "Earth";
7847

48+
public static final int TEST_STATE_PAUSE_POSITION = 4;
49+
public static final String TEST_STATE_PAUSE_SELECTION = "Jupiter";
50+
7951
@UiThreadTest
80-
public void terminationShouldPreserveInstanceState() {
52+
public void testTerminationShouldPreserveInstanceState() {
8153
mActivity.setSpinnerPosition(TEST_STATE_DESTROY_POSITION);
8254
mActivity.setSpinnerSelection(TEST_STATE_DESTROY_SELECTION);
8355

@@ -93,7 +65,7 @@ public void terminationShouldPreserveInstanceState() {
9365
}
9466

9567
@UiThreadTest
96-
public void pauseShouldPreserveInstanceState() {
68+
public void testPauseShouldPreserveInstanceState() {
9769
Instrumentation mInstr = this.getInstrumentation();
9870
mActivity.setSpinnerPosition(TEST_STATE_PAUSE_POSITION);
9971
mActivity.setSpinnerSelection(TEST_STATE_PAUSE_SELECTION);
@@ -111,4 +83,32 @@ public void pauseShouldPreserveInstanceState() {
11183
assertEquals(TEST_STATE_PAUSE_SELECTION, currentSelection);
11284
}
11385

86+
public void testSpinnerSelection() {
87+
mActivity.runOnUiThread(new Runnable() {
88+
public void run() {
89+
mSpinner.requestFocus();
90+
mSpinner.setSelection(0);
91+
}
92+
});
93+
int count = mPlanetData.getCount();
94+
int testposition = count % 2;
95+
this.sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
96+
for (int i = 1; i <= testposition; i++) {
97+
this.sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
98+
}
99+
100+
this.sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
101+
102+
// Ensure that the text is not empty
103+
int mPos = mSpinner.getSelectedItemPosition();
104+
String mSelection = (String) mSpinner.getItemAtPosition(mPos);
105+
106+
// Compare selection in the Spinner with the text view
107+
TextView resultView = (TextView) mActivity
108+
.findViewById(com.android.example.spinner.R.id.SpinnerResult);
109+
110+
String resultText = (String) resultView.getText();
111+
112+
assertEquals(resultText, mSelection);
113+
}
114114
}

‎com.vogella.android.test.fileaccess.test/src/com/vogella/android/test/fileaccess/test/FileTest.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,26 @@
1515
public class FileTest extends TestCase {
1616

1717
public int fileWrites = 0;
18-
1918

2019
public class StubOutputStream extends FileOutputStream {
2120

2221
public StubOutputStream() throws FileNotFoundException {
2322
super(FileDescriptor.out);
2423
}
2524

26-
// Count number of calls
25+
// count number of calls
2726
@Override
2827
public void write(byte[] buffer) throws IOException {
2928
fileWrites++;
3029
}
31-
3230
}
33-
3431
MockContext context = new MockContext() {
3532
public java.io.FileOutputStream openFileOutput(String name, int mode)
3633
throws java.io.FileNotFoundException {
3734
return new StubOutputStream();
3835
};
39-
4036
};
41-
4237

43-
4438
public void testWriteConfigurationShouldAccessFileSystemTwice() {
4539
assertEquals("No file writes yet", fileWrites, 0);
4640
Util.writeConfiguration(context);

0 commit comments

Comments
 (0)