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

UI refresh

Browse Source 
Bug: 3110575
Change-Id: Ia6ffef6de8882920b89372052b5e29968bedfe5f
This commit is contained in:
Daisuke Miyakawa
2010-10-19 10:10:25 -07:00
parent cfcb55d3f5
commit c05efc1df7
3 changed files with 61 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:keepScreenOn="true" android:keepScreenOn="true"
android:paddingTop="70dip" android:paddingTop="140dip"
android:paddingBottom="80dip" android:paddingBottom="60dip"
android:paddingLeft="60dip" android:paddingLeft="60dip"
android:paddingRight="60dip"> android:paddingRight="60dip">
@@ -53,22 +53,33 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_weight=".4" android:layout_weight=".4"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingTop="20dip" android:paddingTop="80dip"
android:paddingLeft="50dip" android:paddingLeft="50dip"
android:paddingRight="50dip" android:paddingRight="50dip"
android:paddingBottom="15dip"> android:paddingBottom="15dip">
<!-- divider -->
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginBottom="4dip"
android:background="@color/divider_color" />
<!-- Assume the text size of this text should be same as Preference's <!-- Assume the text size of this text should be same as Preference's
texts. See also preference.xml --> texts. See also preference.xml -->
<TextView android:id="@+id/wifi_setup_status" <TextView android:id="@+id/wifi_setup_status"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#ff555555" android:background="#00000000"
android:textColor="#ff666666"
android:paddingLeft="5dip" android:paddingLeft="5dip"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:layout_marginBottom="20dip"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/wifi_setup_status_select_network"/> android:text="@string/wifi_setup_status_select_network"/>
<!-- divider -->
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginTop="4dip"
android:layout_marginBottom="20dip"
android:background="@color/divider_color" />
<fragment class="com.android.settings.wifi.WifiSettings" <fragment class="com.android.settings.wifi.WifiSettings"
android:id="@+id/wifi_setup_fragment" android:id="@+id/wifi_setup_fragment"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -80,14 +91,17 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_weight=".3" android:layout_weight=".3"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="right"
android:paddingTop="22dip" android:paddingTop="22dip"
android:paddingLeft="50dip" android:paddingRight="50dip"
android:paddingBottom="10dip"> android:paddingBottom="10dip">
<TextView android:id="@+id/scanning_progress_text" <TextView android:id="@+id/scanning_progress_text"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:textSize="24dip"/> android:gravity="right"
android:textSize="22dip"
android:textColor="#ff40520f" />
<ProgressBar android:id="@+id/scanning_progress_bar" <ProgressBar android:id="@+id/scanning_progress_bar"
android:layout_width="220dip" android:layout_width="220dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -95,40 +109,45 @@
style="?android:attr/progressBarStyleHorizontal" /> style="?android:attr/progressBarStyleHorizontal" />
<Button android:id="@+id/wifi_setup_connect" <Button android:id="@+id/wifi_setup_connect"
android:layout_width="220dip" android:layout_width="260dip"
android:layout_height="wrap_content" android:layout_height="60dip"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:textSize="24dip" android:textSize="24dip"
android:text="@string/wifi_connect" android:text="@string/wifi_connect"
android:visibility="gone" /> android:visibility="gone" />
<Button android:id="@+id/wifi_setup_forget" <Button android:id="@+id/wifi_setup_forget"
android:layout_width="220dip" android:layout_width="260dip"
android:layout_height="wrap_content" android:layout_height="60dip"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:textSize="24dip" android:textSize="24dip"
android:text="@string/wifi_forget" android:text="@string/wifi_forget"
android:visibility="gone" /> android:visibility="gone" />
<Button android:id="@+id/wifi_setup_add_network" <Button android:id="@+id/wifi_setup_add_network"
android:layout_width="220dip" android:layout_width="260dip"
android:layout_height="wrap_content" android:layout_height="60dip"
android:layout_above="@+id/wifi_setup_refresh_list" android:layout_above="@+id/wifi_setup_refresh_list"
android:layout_alignParentRight="true"
android:textSize="24dip" android:textSize="24dip"
android:text="@string/wifi_setup_add_network" android:text="@string/wifi_setup_add_network"
android:enabled="false" /> android:enabled="false" />
<Button android:id="@+id/wifi_setup_refresh_list" <Button android:id="@+id/wifi_setup_refresh_list"
android:layout_width="220dip" android:layout_width="260dip"
android:layout_height="wrap_content" android:layout_height="60dip"
android:layout_above="@+id/wifi_setup_skip_or_next" android:layout_above="@+id/wifi_setup_skip_or_next"
android:layout_alignParentRight="true"
android:textSize="24dip" android:textSize="24dip"
android:text="@string/wifi_setup_refresh_list" android:text="@string/wifi_setup_refresh_list"
android:enabled="false" /> android:enabled="false" />
<Button android:id="@+id/wifi_setup_skip_or_next" <Button android:id="@+id/wifi_setup_skip_or_next"
android:layout_width="220dip" android:layout_width="260dip"
android:layout_height="wrap_content" android:layout_height="60dip"
android:layout_marginTop="30dip" android:layout_marginTop="30dip"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:textSize="24dip" android:textSize="24dip"
android:text="@string/wifi_setup_skip" android:text="@string/wifi_setup_skip"

22
res/values-xlarge/colors.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright (C) 2010 Google Inc.
*
* 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.
*/
-->
<resources>
<color name="divider_color">#ff222222</color>
</resources>

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

@@ -93,7 +93,7 @@ public class WifiSettings extends SettingsPreferenceFragment
// ListView won't become larger than the screen. // ListView won't become larger than the screen.
// //
// This constant doesn't affect other contexts other than SetupWizard XL. // This constant doesn't affect other contexts other than SetupWizard XL.
private static int MAX_MENU_COUNT_IN_XL = 7; private static int MAX_MENU_COUNT_IN_XL = 6;
private final IntentFilter mFilter; private final IntentFilter mFilter;
private final BroadcastReceiver mReceiver; private final BroadcastReceiver mReceiver;