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

Match setup wizard wifi settings with new wireframes

Browse Source 
Bug: 6521472

Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
This commit is contained in:
Michael Kolb
2012-05-23 10:26:53 -07:00
parent 3a821e86f5
commit 9d5a6eb4d7
9 changed files with 99 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_menu_add.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 534 B

After

Width:  |  Height:  |  Size: 667 B

BIN
res/drawable-mdpi/ic_menu_add.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 476 B

After

Width:  |  Height:  |  Size: 596 B

BIN
res/drawable-xhdpi/ic_menu_add.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 610 B

After

Width:  |  Height:  |  Size: 761 B

55
res/layout/setup_preference.xml
View File

@@ -46,23 +46,13 @@
android:gravity="bottom" />
<ImageButton
android:id="@+id/add_network"
android:layout_width="@dimen/setup_button_size"
android:layout_height="@dimen/setup_button_size"
android:layout_marginLeft="8dip"
android:layout_marginBottom="8dip"
android:src="@drawable/ic_menu_add"
android:background="?android:attr/actionBarItemBackground"
android:contentDescription="@string/wifi_add_network" />
<ImageButton
android:id="@+id/wps_push"
android:id="@+id/more"
android:layout_width="@dimen/setup_button_size"
android:layout_height="@dimen/setup_button_size"
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
android:layout_marginBottom="8dip"
android:src="@drawable/ic_wps"
android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
android:background="?android:attr/actionBarItemBackground"
android:contentDescription="@string/wifi_menu_wps_pbc" />
@@ -102,6 +92,47 @@
android:gravity="center"
android:visibility="gone" />
<ImageView
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/setup_item_margin"
android:background="@*android:drawable/list_divider_holo_dark" />
<LinearLayout
android:id="@+id/other_network"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/setup_item_margin"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingRight="?android:attr/scrollbarSize" >
<ImageView
android:id="@+id/add_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_menu_add" />
<TextView
android:id="@+id/other"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_weight="1"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/wifi_other_network" />
</LinearLayout>
<RelativeLayout
android:id="@+id/button_bar"
android:layout_width="match_parent"

21
res/menu/wifi_setup.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/wifi_wps"
android:title="@string/wifi_setup_wps" />
</menu>

1
res/values-sw600dp/dimens.xml
View File

@@ -29,4 +29,5 @@
<item type="dimen" name="setup_border_width">10%</item>
<dimen name="setup_margin_bottom">0dip</dimen>
<dimen name="setup_button_size">48dip</dimen>
<dimen name="setup_item_margin">32dip</dimen>
</resources>

1
res/values/dimens.xml
View File

@@ -41,6 +41,7 @@
<dimen name="setup_margin_bottom">0dip</dimen>
<dimen name="setup_title_size">25sp</dimen>
<dimen name="setup_button_size">32dip</dimen>
<dimen name="setup_item_margin">16dip</dimen>
<dimen name="divider_height">3dip</dimen>
<dimen name="divider_margin_top">6dip</dimen>

6
res/values/strings.xml
View File

@@ -1230,6 +1230,12 @@
<string name="wifi_empty_list_wifi_off">To see available networks, turn Wi-Fi on.</string>
<!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
<string name="wifi_empty_list_wifi_on">Searching for Wi-Fi networks\u2026</string>
<!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
<string name="wifi_other_network">Other network\u2026</string>
<!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
<string name="wifi_more">More</string>
<!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
<string name="wifi_setup_wps">Automatic setup (WPS)</string>
<!-- Dialog for Access Points --> <skip />
<!-- Label to show/hide advanced options -->

40
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -59,6 +59,8 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.ImageButton;
import android.widget.PopupMenu;
import android.widget.PopupMenu.OnMenuItemClickListener;
import android.widget.RelativeLayout;
import android.widget.Switch;
import android.widget.TextView;
@@ -193,22 +195,12 @@ public class WifiSettings extends SettingsPreferenceFragment
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
public View onCreateView(final LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
if (mSetupWizardMode) {
View view = inflater.inflate(R.layout.setup_preference, container, false);
ImageButton b1 = (ImageButton) view.findViewById(R.id.wps_push);
if (b1 != null) {
b1.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
showDialog(WPS_PBC_DIALOG_ID);
}
});
}
ImageButton b2 = (ImageButton) view.findViewById(R.id.add_network);
if (b2 != null) {
b2.setOnClickListener(new OnClickListener() {
View other = view.findViewById(R.id.other_network);
other.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (mWifiManager.isWifiEnabled()) {
@@ -216,6 +208,28 @@ public class WifiSettings extends SettingsPreferenceFragment
}
}
});
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();
}
}
});
}
return view;
} else {