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

Add modifications which should have been in the change

Browse Source 
I520d690d3301837d32f91dad54a973a379ce1989

Change-Id: Iecca6b4fef2ec42a62273035b096ccedcea94d78
This commit is contained in:
Daisuke Miyakawa
2010-09-01 19:27:11 -07:00
parent d36699282c
commit 5cd60eb8aa
11 changed files with 234 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
View File

@@ -5,145 +5,128 @@
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal"
android:orientation="horizontal" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:paddingTop="70dip"
android:paddingTop="70dip" android:paddingBottom="80dip"
android:paddingBottom="80dip" android:paddingLeft="60dip"
android:paddingLeft="60dip" android:paddingRight="60dip">
android:paddingRight="60dip">
<!-- Left: almost empty with one title at the top -->
<RelativeLayout android:orientation="vertical"
android:layout_width="0px"
android:layout_weight=".3"
android:layout_height="fill_parent"
android:paddingRight="10dip"
android:paddingBottom="10dip">
<TextView android:id="@+id/wifi_setup_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center|top"
android:textSize="48dip"
android:textColor="#FF30FF30"
android:text="@string/wifi_setup_title"/>
<Button android:id="@+id/wifi_setup_cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:textSize="24dip"
android:text="@string/wifi_cancel"
android:visibility="gone" />
</RelativeLayout>
<!-- Left: almost empty with one title at the top --> <!-- Center: fragment -->
<RelativeLayout <LinearLayout android:orientation="vertical"
android:orientation="vertical" android:layout_width="0px"
android:layout_width="0px" android:layout_weight=".4"
android:layout_weight=".3" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:paddingTop="20dip"
android:paddingRight="10dip" android:paddingLeft="10dip"
android:paddingBottom="10dip"> android:paddingRight="30dip"
<TextView android:paddingBottom="15dip">
android:id="@+id/wifi_setup_title" <!-- Assume the text size of this text should be same as Preference's
android:layout_width="fill_parent" texts. See also preference.xml -->
android:layout_height="wrap_content" <TextView android:id="@+id/wifi_setup_status"
android:gravity="center|top" android:layout_width="fill_parent"
android:textSize="48dip" android:layout_height="wrap_content"
android:textColor="#FF30FF30" android:background="#ff113344"
android:text="@string/wifi_setup_title"/> android:paddingLeft="5dip"
<Button android:paddingTop="5dip"
android:id="@+id/wifi_setup_cancel" android:paddingBottom="5dip"
android:layout_width="fill_parent" android:layout_marginBottom="20dip"
android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_alignParentBottom="true" android:text="@string/wifi_setup_status_select_network"/>
android:textSize="24dip" <fragment class="com.android.settings.wifi.WifiSettings"
android:text="@string/wifi_cancel" android:id="@+id/wifi_setup_fragment"
android:visibility="gone" /> android:layout_width="fill_parent"
</RelativeLayout> android:layout_height="wrap_content" />
</LinearLayout>
<!-- Center: Full of fragment --> <!-- Right: various information -->
<LinearLayout <RelativeLayout android:orientation="vertical"
android:orientation="vertical" android:layout_width="0px"
android:layout_width="0px" android:layout_weight=".3"
android:layout_weight=".4" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:paddingTop="22dip"
android:paddingTop="20dip" android:paddingLeft="30dip"
android:paddingLeft="10dip" android:paddingBottom="10dip">
android:paddingRight="30dip" <TextView android:id="@+id/scanning_progress_text"
android:paddingBottom="15dip"> android:layout_width="fill_parent"
<!-- Assume the text size of this text should be same as Preference's android:layout_height="wrap_content"
texts. See also preference.xml --> android:layout_alignParentTop="true"
<TextView android:textSize="24dip"
android:id="@+id/wifi_setup_status" android:text="@string/progress_scanning"/>
android:layout_width="fill_parent" <ProgressBar android:id="@+id/scanning_progress_bar"
android:layout_height="wrap_content" android:layout_width="100dip"
android:background="#ff113344" android:layout_height="wrap_content"
android:paddingLeft="5dip" android:layout_below="@id/scanning_progress_text"
android:paddingTop="5dip" style="?android:attr/progressBarStyleHorizontal" />
android:paddingBottom="5dip"
android:layout_marginBottom="20dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/wifi_setup_status_select_network"/>
<fragment
class="com.android.settings.wifi.WifiSettings"
android:id="@+id/wifi_setup_fragment"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<!-- Right: various information --> <Button android:id="@+id/wifi_setup_connect"
<RelativeLayout android:layout_width="fill_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:layout_width="0px" android:layout_alignParentBottom="true"
android:layout_weight=".3" android:textSize="24dip"
android:layout_height="fill_parent" android:text="@string/wifi_connect"
android:paddingTop="22dip" android:visibility="gone" />
android:paddingLeft="30dip" <Button android:id="@+id/wifi_setup_forget"
android:paddingBottom="10dip"> android:layout_width="fill_parent"
<TextView android:layout_height="wrap_content"
android:id="@+id/scanning_progress_text" android:layout_alignParentBottom="true"
android:layout_width="fill_parent" android:textSize="24dip"
android:layout_height="wrap_content" android:text="@string/wifi_forget"
android:layout_alignParentTop="true" android:visibility="gone" />
android:textSize="24dip"
android:text="@string/progress_scanning"/>
<ProgressBar
android:id="@+id/scanning_progress_bar"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:layout_below="@id/scanning_progress_text"
style="?android:attr/progressBarStyleHorizontal" />
<Button <Button android:id="@+id/wifi_setup_skip_or_next"
android:id="@+id/wifi_setup_connect" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="30dip"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:textSize="24dip" android:textSize="24dip"
android:text="@string/wifi_connect" android:text="@string/wifi_setup_skip" />
android:visibility="gone" />
<Button
android:id="@+id/wifi_setup_forget"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:textSize="24dip"
android:text="@string/wifi_forget"
android:visibility="gone" />
<Button <Button android:id="@+id/wifi_setup_refresh_list"
android:id="@+id/wifi_setup_skip_or_next" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_above="@id/wifi_setup_skip_or_next"
android:layout_marginTop="30dip" android:textSize="24dip"
android:layout_alignParentBottom="true" android:text="@string/wifi_setup_refresh_list" />
android:textSize="24dip"
android:text="@string/wifi_setup_skip" />
<Button <Button android:id="@+id/wifi_setup_add_network"
android:id="@+id/wifi_setup_refresh_list" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_above="@id/wifi_setup_refresh_list"
android:layout_above="@id/wifi_setup_skip_or_next" android:textSize="24dip"
android:textSize="24dip" android:text="@string/wifi_setup_add_network" />
android:text="@string/wifi_setup_refresh_list" /> </RelativeLayout>
<Button
android:id="@+id/wifi_setup_add_network"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@id/wifi_setup_refresh_list"
android:textSize="24dip"
android:text="@string/wifi_setup_add_network" />
</RelativeLayout>
</LinearLayout> </LinearLayout>

210
res/layout/wifi_config_preference.xml
View File

@@ -14,138 +14,132 @@
limitations under the License. limitations under the License.
--> -->
<!-- All ids in this layout must be in wifi_dialog.xml --> <!-- All ids in this layout must be in wifi_dialog.xml -->
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!-- <TextView android:id="@+id/title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/title" /> -->
<LinearLayout android:id="@+id/info"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
<LinearLayout android:id="@+id/type"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/wifi_ssid" />
<EditText android:id="@+id/ssid"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="fill_parent">
android:singleLine="true"
android:inputType="textNoSuggestions" />
<TextView android:layout_width="fill_parent" <LinearLayout android:id="@+id/info"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:text="@string/wifi_security" /> android:layout_height="wrap_content"
android:orientation="vertical" />
<LinearLayout android:id="@+id/type"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<Spinner android:id="@+id/security" <TextView android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="@string/wifi_ssid" />
android:prompt="@string/wifi_security"
android:entries="@array/wifi_security" />
</LinearLayout> <!-- android:id="@+id/type" -->
<LinearLayout android:id="@+id/fields" <EditText android:id="@+id/ssid"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:inputType="textNoSuggestions" />
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/wifi_security" />
<Spinner android:id="@+id/security"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:prompt="@string/wifi_security"
android:visibility="gone"> android:entries="@array/wifi_security" />
</LinearLayout> <!-- android:id="@+id/type" -->
<LinearLayout android:id="@+id/eap" <LinearLayout android:id="@+id/fields"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <LinearLayout android:id="@+id/eap"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/wifi_eap_method" /> android:orientation="vertical"
android:visibility="gone">
<Spinner android:id="@+id/method" <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:prompt="@string/wifi_eap_method" android:text="@string/wifi_eap_method" />
android:entries="@array/wifi_eap_method" />
<TextView <Spinner android:id="@+id/method"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/please_select_phase2" /> android:prompt="@string/wifi_eap_method"
android:entries="@array/wifi_eap_method" />
<Spinner android:id="@+id/phase2" <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:prompt="@string/please_select_phase2" android:text="@string/please_select_phase2" />
android:entries="@array/wifi_phase2_entries" />
<TextView <Spinner android:id="@+id/phase2"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/wifi_eap_ca_cert" /> android:prompt="@string/please_select_phase2"
android:entries="@array/wifi_phase2_entries" />
<Spinner android:id="@+id/ca_cert" <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:prompt="@string/wifi_eap_ca_cert" /> android:text="@string/wifi_eap_ca_cert" />
<TextView <Spinner android:id="@+id/ca_cert"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/wifi_eap_user_cert" /> android:prompt="@string/wifi_eap_ca_cert" />
<Spinner android:id="@+id/user_cert" <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:prompt="@string/wifi_eap_user_cert" /> android:text="@string/wifi_eap_user_cert" />
<TextView <Spinner android:id="@+id/user_cert"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/wifi_eap_identity" /> android:prompt="@string/wifi_eap_user_cert" />
<EditText android:id="@+id/identity" <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:text="@string/wifi_eap_identity" />
android:inputType="textNoSuggestions" />
<TextView <EditText android:id="@+id/identity"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/wifi_eap_anonymous" /> android:singleLine="true"
android:inputType="textNoSuggestions" />
<EditText android:id="@+id/anonymous" <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:text="@string/wifi_eap_anonymous" />
android:inputType="textNoSuggestions" />
</LinearLayout> <!-- android:id="@+id/eap" -->
<TextView android:layout_width="fill_parent" <EditText android:id="@+id/anonymous"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:text="@string/wifi_password" /> android:layout_height="wrap_content"
android:singleLine="true"
android:inputType="textNoSuggestions" />
</LinearLayout> <!-- android:id="@+id/eap" -->
<EditText android:id="@+id/password" <TextView android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="@string/wifi_password" />
android:singleLine="true"
android:password="true" />
<CheckBox android:id="@+id/show_password" <EditText android:id="@+id/password"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/wifi_show_password" /> android:singleLine="true"
</LinearLayout> <!-- android:id="@+id/fields" --> android:password="true" />
<CheckBox android:id="@+id/show_password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/wifi_show_password" />
</LinearLayout> <!-- android:id="@+id/fields" -->
</LinearLayout> </LinearLayout>

11
res/xml/wifi_access_points_for_wifi_setup_xl.xml
View File

@@ -14,11 +14,8 @@
limitations under the License. limitations under the License.
--> -->
<PreferenceScreen <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android"> <com.android.settings.wifi.AccessPointCategoryForSetupWizardXL
android:key="access_points"
<com.android.settings.wifi.AccessPointCategoryForSetupWizardXL android:persistent="false" />
android:key="access_points"
android:persistent="false" />
</PreferenceScreen> </PreferenceScreen>

1
src/com/android/settings/ProgressCategory.java
View File

@@ -17,7 +17,6 @@
package com.android.settings; package com.android.settings;
import android.content.Context; import android.content.Context;
import android.preference.PreferenceCategory;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;

4
src/com/android/settings/wifi/AccessPoint.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import com.android.settings.R;
import android.content.Context; import android.content.Context;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.net.wifi.ScanResult; import android.net.wifi.ScanResult;
@@ -27,8 +29,6 @@ import android.preference.Preference;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import com.android.settings.R;
import java.util.Comparator; import java.util.Comparator;
class AccessPoint extends Preference { class AccessPoint extends Preference {

6
src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import android.content.Context;
import android.util.AttributeSet;
import com.android.settings.ProgressCategoryBase; import com.android.settings.ProgressCategoryBase;
import com.android.settings.R; import com.android.settings.R;
import android.content.Context;
import android.util.AttributeSet;
public class AccessPointCategoryForSetupWizardXL extends ProgressCategoryBase { public class AccessPointCategoryForSetupWizardXL extends ProgressCategoryBase {
public AccessPointCategoryForSetupWizardXL(Context context, AttributeSet attrs) { public AccessPointCategoryForSetupWizardXL(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);

4
src/com/android/settings/wifi/Summary.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import com.android.settings.R;
import android.content.Context; import android.content.Context;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import com.android.settings.R;
class Summary { class Summary {
static String get(Context context, String ssid, DetailedState state) { static String get(Context context, String ssid, DetailedState state) {
String[] formats = context.getResources().getStringArray((ssid == null) String[] formats = context.getResources().getStringArray((ssid == null)

4
src/com/android/settings/wifi/WifiConfigPreference.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import com.android.settings.R;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.preference.Preference; import android.preference.Preference;
@@ -24,8 +26,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import com.android.settings.R;
/** /**
* Preference letting users modify a setting for Wifi network. This work as an alternative UI * Preference letting users modify a setting for Wifi network. This work as an alternative UI
* for {@link WifiDialog} without shouwing popup Dialog. * for {@link WifiDialog} without shouwing popup Dialog.

4
src/com/android/settings/wifi/WifiDialog.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import com.android.settings.R;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -23,8 +25,6 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import com.android.settings.R;
class WifiDialog extends AlertDialog implements WifiConfigUiBase { class WifiDialog extends AlertDialog implements WifiConfigUiBase {
static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE; static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
static final int BUTTON_FORGET = DialogInterface.BUTTON_NEUTRAL; static final int BUTTON_FORGET = DialogInterface.BUTTON_NEUTRAL;

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

@@ -16,6 +16,10 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import com.android.settings.ProgressCategoryBase;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import android.app.Activity; import android.app.Activity;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@@ -47,17 +51,10 @@ import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.Button; import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.android.settings.ProgressCategoryBase;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.TreeSet; import java.util.TreeSet;

5
src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
View File

@@ -16,10 +16,11 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import com.android.settings.R;
import android.app.Activity; import android.app.Activity;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.Window; import android.view.Window;
@@ -27,8 +28,6 @@ import android.widget.Button;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import com.android.settings.R;
import java.util.EnumMap; import java.util.EnumMap;
/** /**