diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-05-29 13:19:26 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-05-29 13:19:26 -0700 |
| commit | 5864701197e9943a706cb9bf329975f428d7d1c8 (patch) | |
| tree | 955bdf41654bc15ed4c3d08c8b3bf27a6ee4c698 /src | |
| parent | a5ac7ce5149ea3f6f4b27259cd9fd4a23b7ac47a (diff) | |
| download | packages_apps_Settings-5864701197e9943a706cb9bf329975f428d7d1c8.zip packages_apps_Settings-5864701197e9943a706cb9bf329975f428d7d1c8.tar.gz packages_apps_Settings-5864701197e9943a706cb9bf329975f428d7d1c8.tar.bz2 | |
Retain text in Rename Device dialog.
Also, show the current device name in the dialog, if available.
Bug: 6508967
Change-Id: I34d420e197796352aeab74121bdee55c2d2854d7
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/wifi/p2p/WifiP2pSettings.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index b369afe..c181db9 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -90,10 +90,13 @@ public class WifiP2pSettings extends SettingsPreferenceFragment private static final int DIALOG_RENAME = 3; private static final String SAVE_DIALOG_PEER = "PEER_STATE"; + private static final String SAVE_DEVICE_NAME = "DEV_NAME"; private WifiP2pDevice mThisDevice; private WifiP2pDeviceList mPeers = new WifiP2pDeviceList(); + private String mSavedDeviceName; + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -162,6 +165,9 @@ public class WifiP2pSettings extends SettingsPreferenceFragment WifiP2pDevice device = savedInstanceState.getParcelable(SAVE_DIALOG_PEER); mSelectedWifiPeer = new WifiP2pPeer(getActivity(), device); } + if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DEVICE_NAME)) { + mSavedDeviceName = savedInstanceState.getString(SAVE_DEVICE_NAME); + } mRenameListener = new OnClickListener() { @Override @@ -376,6 +382,14 @@ public class WifiP2pSettings extends SettingsPreferenceFragment return dialog; } else if (id == DIALOG_RENAME) { mDeviceNameText = new EditText(getActivity()); + if (mSavedDeviceName != null) { + mDeviceNameText.setText(mSavedDeviceName); + mDeviceNameText.setSelection(mSavedDeviceName.length()); + } else if (mThisDevice != null && !TextUtils.isEmpty(mThisDevice.deviceName)) { + mDeviceNameText.setText(mThisDevice.deviceName); + mDeviceNameText.setSelection(0, mThisDevice.deviceName.length()); + } + mSavedDeviceName = null; AlertDialog dialog = new AlertDialog.Builder(getActivity()) .setTitle(R.string.wifi_p2p_menu_rename) .setView(mDeviceNameText) @@ -392,6 +406,9 @@ public class WifiP2pSettings extends SettingsPreferenceFragment if (mSelectedWifiPeer != null) { outState.putParcelable(SAVE_DIALOG_PEER, mSelectedWifiPeer.device); } + if (mDeviceNameText != null) { + outState.putString(SAVE_DEVICE_NAME, mDeviceNameText.getText().toString()); + } } public void onPeersAvailable(WifiP2pDeviceList peers) { |