From 267d51a68a6e2bc40b90d199425af88a7a824f53 Mon Sep 17 00:00:00 2001 From: Daisuke Miyakawa Date: Sat, 15 Jan 2011 15:20:30 -0800 Subject: [PATCH] Disable long-press behavior in setupwizard. Bug: 3355243 Change-Id: Ibe15da5ced91f975ca9c9c3c4d42cbd1c753f9d4 --- src/com/android/settings/wifi/WifiSettings.java | 4 +++- .../settings/wifi/WifiSettingsForSetupWizardXL.java | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 857e15346d6..e47660a241f 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -270,7 +270,9 @@ public class WifiSettings extends SettingsPreferenceFragment @Override public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) { - if (info instanceof AdapterContextMenuInfo) { + if (mInXlSetupWizard) { + ((WifiSettingsForSetupWizardXL)getActivity()).onCreateContextMenu(menu, view, info); + } else if (info instanceof AdapterContextMenuInfo) { Preference preference = (Preference) getListView().getItemAtPosition( ((AdapterContextMenuInfo) info).position); diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java index f420f34e8ad..7fccce00971 100644 --- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java +++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java @@ -30,7 +30,9 @@ import android.preference.PreferenceCategory; import android.text.TextUtils; import android.util.Log; import android.view.View; +import android.view.ContextMenu.ContextMenuInfo; import android.view.View.OnClickListener; +import android.view.ContextMenu; import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; @@ -524,4 +526,9 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis /* package */ void onSaveNetwork(WifiConfiguration config) { mWifiManager.connectNetwork(config); } + + @Override + public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo) { + super.onCreateContextMenu(menu, view, menuInfo); + } }