Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix layout for WifiSettingsForXL

Browse Source 
Change-Id: I99b503005d199084062b63a2de1e049926b212a9
This commit is contained in:
Daisuke Miyakawa
2010-10-29 16:03:23 -07:00
parent 6257bf8675
commit 150d4aaef1
2 changed files with 87 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,100 +13,85 @@
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 xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout
android:orientation="horizontal" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:orientation="horizontal"
android:layout_height="fill_parent" android:layout_width="fill_parent"
android:keepScreenOn="true" android:layout_height="fill_parent"
android:paddingTop="140dip" android:keepScreenOn="true"
android:paddingBottom="60dip" android:paddingTop="60dip"
android:paddingLeft="60dip" android:paddingLeft="100dip"
android:paddingRight="60dip"> android:paddingRight="100dip"
android:paddingBottom="100dip">
<!-- Left: almost empty with one title at the top --> <TextView
<RelativeLayout android:orientation="vertical" android:id="@+id/wifi_setup_title"
android:layout_width="0px" android:layout_width="fill_parent"
android:layout_weight=".3" android:layout_height="wrap_content"
android:layout_height="fill_parent" android:layout_alignParentLeft="true"
android:paddingRight="50dip" android:layout_alignParentTop="true"
android:paddingBottom="10dip"> android:gravity="left"
<TextView android:id="@+id/wifi_setup_title" android:textSize="40dip"
android:layout_width="fill_parent" android:textColor="#FF99cc00"
android:layout_height="wrap_content" android:text="@string/wifi_setup_title"/>
android:layout_alignParentRight="true"
android:gravity="right"
android:textSize="48dip"
android:textColor="#FF99cc00"
android:text="@string/wifi_setup_title"/>
<Button android:id="@+id/wifi_setup_cancel"
android:layout_width="220dip"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:textSize="24dip"
android:text="@string/wifi_cancel"
android:visibility="gone" />
</RelativeLayout>
<!-- Center: fragment --> <ProgressBar
<LinearLayout android:orientation="vertical" android:id="@+id/scanning_progress_bar"
android:layout_width="0px" android:layout_width="100dip"
android:layout_weight=".4" android:layout_height="wrap_content"
android:layout_height="fill_parent" android:layout_alignParentRight="true"
android:paddingTop="80dip" android:layout_above="@+id/scanning_progress_text"
android:paddingLeft="50dip" style="?android:attr/progressBarStyleHorizontal" />
android:paddingRight="50dip"
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
texts. See also preference.xml -->
<TextView android:id="@+id/wifi_setup_status"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:textColor="#ff666666"
android:paddingLeft="5dip"
android:textAppearance="?android:attr/textAppearanceLarge"
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"
android:id="@+id/wifi_setup_fragment"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<!-- Right: various information --> <TextView
<RelativeLayout android:orientation="vertical" android:id="@+id/scanning_progress_text"
android:layout_width="0px" android:layout_width="fill_parent"
android:layout_weight=".3" android:layout_height="wrap_content"
android:layout_height="fill_parent" android:layout_alignParentRight="true"
android:gravity="right" android:layout_above="@+id/top_divider"
android:paddingTop="22dip" android:gravity="right"
android:paddingRight="50dip" android:textSize="22dip"
android:paddingBottom="10dip"> android:textColor="#ff40520f" />
<TextView android:id="@+id/scanning_progress_text"
android:layout_width="fill_parent" <!-- Divider -->
android:layout_height="wrap_content" <View
android:layout_alignParentTop="true" android:id="@+id/top_divider"
android:gravity="right" android:layout_width="match_parent"
android:textSize="22dip" android:layout_height="1px"
android:textColor="#ff40520f" /> android:layout_below="@id/wifi_setup_title"
<ProgressBar android:id="@+id/scanning_progress_bar" android:background="@color/divider_color"
android:layout_width="220dip" android:layout_marginBottom="5dip" />
android:layout_height="wrap_content"
android:layout_below="@id/scanning_progress_text" <TextView
style="?android:attr/progressBarStyleHorizontal" /> android:id="@+id/wifi_setup_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/top_divider"
android:layout_marginBottom="20dip"
android:layout_marginLeft="5dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/wifi_setup_status_select_network"/>
<FrameLayout
android:id="@+id/wifi_setup"
android:layout_width="400dip"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_below="@+id/wifi_setup_status">
<fragment
class="com.android.settings.wifi.WifiSettings"
android:id="@+id/wifi_setup_fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
<RelativeLayout
android:id="@+id/right_buttons"
android:layout_width="300dip"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true">
<Button android:id="@+id/wifi_setup_connect" <Button android:id="@+id/wifi_setup_connect"
android:layout_width="260dip" android:layout_width="260dip"
@@ -153,4 +138,13 @@
android:text="@string/wifi_setup_skip" android:text="@string/wifi_setup_skip"
android:enabled="false" /> android:enabled="false" />
</RelativeLayout> </RelativeLayout>
</LinearLayout>
<Button android:id="@+id/wifi_setup_cancel"
android:layout_width="260dip"
android:layout_height="60dip"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/right_buttons"
android:textSize="24dip"
android:text="@string/wifi_cancel"
android:visibility="gone" />
</RelativeLayout>

2
res/values-xlarge/colors.xml
View File

@@ -18,5 +18,5 @@
--> -->
<resources> <resources>
<color name="divider_color">#ff222222</color> <color name="divider_color">#ff666666</color>
</resources> </resources>