commit ef2b359b48c10d94fa70d73d517018d1fb6e1867
author Baligh Uddin <baligh@google.com> Tue Feb 11 21:23:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 11 21:23:28 2014 +0000
tree eba1cfaddc951f0a4e7eb59d56e659f5f553bc47
parent edf696774ea590ed5edcc0ed2dc57795227077da
parent 780f729f71adf3e3b04e07abf59f2399ffc939f5

Merge "Import translations. DO NOT MERGE"

src/com/android/settings/TestingSettings.java

diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java
index 2eadd84..3994560 100644
--- a/src/com/android/settings/TestingSettings.java
+++ b/src/com/android/settings/TestingSettings.java
@@ -17,13 +17,15 @@
 package com.android.settings;
 
 import android.os.Bundle;
+import android.preference.PreferenceActivity;
 
-public class TestingSettings extends SettingsPreferenceFragment {
+public class TestingSettings extends PreferenceActivity {
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
         addPreferencesFromResource(R.xml.testing_settings);
     }
+
 }

src/com/android/settings/wifi/WifiInfo.java

diff --git a/src/com/android/settings/wifi/WifiInfo.java b/src/com/android/settings/wifi/WifiInfo.java
index cdbb580..291a495 100644
--- a/src/com/android/settings/wifi/WifiInfo.java
+++ b/src/com/android/settings/wifi/WifiInfo.java
@@ -19,17 +19,18 @@
 import com.android.settings.R;
 
 import android.os.Bundle;
-import com.android.settings.SettingsPreferenceFragment;
+import android.preference.PreferenceActivity;
 
 
 /**
  * Wifi information menu item on the diagnostic screen
  */
-public class WifiInfo extends SettingsPreferenceFragment {
+public class WifiInfo extends PreferenceActivity {
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.testing_wifi_settings);
     }
+
 }