Fix Broken PreferenceWithHeadersTest
Bug 6199618
- The XML was trying to inflate fragments from the examples project.
- Make the PrefsOneFragment static so it can be instantiated properly.
Change-Id: Iae966deb60cb385c349f4700628cea62cd370eb9
diff --git a/development/ide/eclipse/.classpath b/development/ide/eclipse/.classpath
index e24e988..6f5bc69 100644
--- a/development/ide/eclipse/.classpath
+++ b/development/ide/eclipse/.classpath
@@ -52,6 +52,7 @@
<classpathentry kind="src" path="cts/tests/tests/permission/src"/>
<classpathentry kind="src" path="cts/tests/tests/permission2/src"/>
<classpathentry kind="src" path="cts/tests/tests/preference/src"/>
+ <classpathentry kind="src" path="cts/tests/tests/preference2/src"/>
<classpathentry kind="src" path="cts/tests/tests/provider/src"/>
<classpathentry kind="src" path="cts/tests/tests/renderscript/src"/>
<classpathentry kind="src" path="cts/tests/tests/security/src"/>
diff --git a/tests/tests/preference2/res/xml/preference_headers.xml b/tests/tests/preference2/res/xml/preference_headers.xml
index 45ee629..2465f7a 100755
--- a/tests/tests/preference2/res/xml/preference_headers.xml
+++ b/tests/tests/preference2/res/xml/preference_headers.xml
@@ -15,23 +15,12 @@
-->
<preference-headers
xmlns:android="http://schemas.android.com/apk/res/android">
-
- <header android:fragment=
- "com.example.android.apis.preference.PreferenceWithHeaders$Prefs1Fragment"
+
+ <header android:fragment="android.preference2.cts.PreferenceWithHeaders$PrefsOneFragment"
android:icon="@drawable/ic_settings_applications"
android:title="Prefs 1"
android:summary="An example of some preferences." />
- <header android:fragment=
- "com.example.android.apis.preference.PreferenceWithHeaders$Prefs2Fragment"
- android:icon="@drawable/ic_settings_display"
- android:title="Prefs 2"
- android:summary="Some other preferences you can see.">
- <!-- Arbitrary key/value pairs can be included with a header as
- arguments to its fragment. -->
- <extra android:name="someKey" android:value="someHeaderValue" />
- </header>
-
<header android:icon="@drawable/ic_settings_display"
android:title="Intent"
android:summary="Launches an Intent.">
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeaders.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeaders.java
index 7a23daf..1059700 100755
--- a/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeaders.java
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeaders.java
@@ -18,6 +18,7 @@
import android.os.Bundle;
import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
import android.widget.Button;
import com.android.cts.preference2.R;
import java.util.List;
@@ -30,7 +31,7 @@
public class PreferenceWithHeaders extends PreferenceActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ super.onCreate(savedInstanceState);
// Add a button to the header list.
if (hasHeaders()) {
Button button = new Button(this);
@@ -46,5 +47,13 @@
public void onBuildHeaders(List<Header> target) {
loadHeadersFromResource(R.xml.preference_headers, target);
}
+
+ public static class PrefsOneFragment extends PreferenceFragment {
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ addPreferencesFromResource(R.xml.preferences);
+ }
+ }
}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersTest.java
index 5b78369..28bff81 100755
--- a/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersTest.java
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersTest.java
@@ -16,10 +16,6 @@
package android.preference2.cts;
-import com.android.cts.preference2.R;
-
-import android.os.Bundle;
-import android.preference.PreferenceFragment;
import android.test.ActivityInstrumentationTestCase2;
public class PreferenceWithHeadersTest
@@ -44,12 +40,4 @@
public void testOnIsHidingHeaders() {
assertFalse(mActivity.onIsHidingHeaders());
}
-
- public class PrefsOneFragment extends PreferenceFragment {
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.preferences);
- }
- }
}