PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WifiSetup] L layout update

Browse Source 
Changed the layout based on the new design mocks. Copied over
StickyHeaderListView and SetupWizardHeader. Currently using the
generic illustration but will update to Wifi setup specific version
once we get them.

Change-Id: I22bdef8c9860d419be55938e1e4a6a682db5b7e8
This commit is contained in:
Maurice Lam
2014-06-27 19:40:20 -07:00
parent e2403822ec
commit 588e61aa05
17 changed files with 501 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
View File

@@ -34,8 +34,10 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ListView;
import android.widget.PopupMenu;
import android.widget.PopupMenu.OnMenuItemClickListener;
import android.widget.TextView;
import com.android.settings.R;
@@ -88,7 +90,16 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.setup_preference, container, false);
final View other = view.findViewById(R.id.other_network);
final ListView list = (ListView) view.findViewById(android.R.id.list);
final View title = view.findViewById(R.id.title);
if (title == null) {
final View header = inflater.inflate(R.layout.setup_wizard_header, list, false);
list.addHeaderView(header);
}
final View other = inflater.inflate(R.layout.setup_wifi_add_network, list, false);
list.addFooterView(other, null, true);
other.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
@@ -97,29 +108,6 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
}
}
});
final ImageButton b = (ImageButton) view.findViewById(R.id.more);
if (b != null) {
b.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (mWifiManager.isWifiEnabled()) {
PopupMenu pm = new PopupMenu(inflater.getContext(), b);
pm.inflate(R.menu.wifi_setup);
pm.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
if (R.id.wifi_wps == item.getItemId()) {
showDialog(WPS_PBC_DIALOG_ID);
return true;
}
return false;
}
});
pm.show();
}
}
});
}
final Intent intent = getActivity().getIntent();
if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) {
@@ -206,5 +194,4 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
ta.recycle();
}
}