diff options
author | Daisuke Miyakawa <dmiyakawa@google.com> | 2011-01-15 14:58:00 -0800 |
---|---|---|
committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2011-01-17 13:26:45 -0800 |
commit | 79c5fd971e71fe7a7f3037474285c1812e3c2c5b (patch) | |
tree | 2fac0feeed1d425c35804b096d0d6c3e98440bbc /src/com/android/settings/SettingsPreferenceFragment.java | |
parent | 3b9b6533a5e50ed146ec24c084533fa35a2d1d01 (diff) | |
download | packages_apps_Settings-79c5fd971e71fe7a7f3037474285c1812e3c2c5b.zip packages_apps_Settings-79c5fd971e71fe7a7f3037474285c1812e3c2c5b.tar.gz packages_apps_Settings-79c5fd971e71fe7a7f3037474285c1812e3c2c5b.tar.bz2 |
Add WifiPickerActivity for PICK_WIFI_NETWORK
- We disable left pane when PICK_WIFI_NETWORK intent is used.
- Add ButtonBarHandler interface and let SettingsPreferenceFragment
use it instead of Settings. Note that
PreferenceActivity#hasNextButton() and
PreferenceActivity#getNextButton() are currently protected methods,
while Settings' relevants are public.
Bug: 3355247
Change-Id: Ie0fae8a1dbce9c7ce37375dff8395dc09b1cc74e
Diffstat (limited to 'src/com/android/settings/SettingsPreferenceFragment.java')
-rw-r--r-- | src/com/android/settings/SettingsPreferenceFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index 0db4f8b..47e31ee 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -158,11 +158,11 @@ public class SettingsPreferenceFragment extends PreferenceFragment } protected boolean hasNextButton() { - return ((Settings)getActivity()).hasNextButton(); + return ((ButtonBarHandler)getActivity()).hasNextButton(); } protected Button getNextButton() { - return ((Settings)getActivity()).getNextButton(); + return ((ButtonBarHandler)getActivity()).getNextButton(); } public void finish() { |