Merge "Wifi select screen redlines" into jb-dev (1c0a8f95) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -145,8 +145,9 @@

		<activity android:name=".wifi.WifiPickerActivity"
		android:label="@string/wifi_setup_wizard_title"
		android:clearTaskOnLaunch="true"
		android:icon="@drawable/empty_icon">
		android:theme="@style/setup_wizard_theme"
		android:icon="@drawable/empty_icon"
		android:clearTaskOnLaunch="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<action android:name="android.net.wifi.PICK_WIFI_NETWORK" />

res/layout/setup_preference.xml

0 → 100644

+141 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 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.
		*/
		-->
		<view
		xmlns:android="http://schemas.android.com/apk/res/android"
		class="com.android.settings.wifi.WifiSettings$ProportionalOuterFrame"
		android:layout_height="match_parent"
		android:layout_width="match_parent">

		<RelativeLayout
		android:id="@+id/title_area"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:gravity="bottom">

		<LinearLayout
		android:id="@+id/button_bar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignBottom="@id/title"
		android:gravity="bottom"
		android:orientation="horizontal">
		<TextView
		android:id="@+id/title"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1.0"
		style="@style/SetupTitle"
		android:text="@string/wifi_setup_wizard_title"
		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" />

		<ImageButton
		android:id="@+id/wps_push"
		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:background="?android:attr/actionBarItemBackground" />

		</LinearLayout>

		<!-- Divider -->
		<View
		android:id="@+id/top_divider"
		style="@style/TopDivider"
		android:layout_below="@id/button_bar" />

		</RelativeLayout>

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_below="@id/title_area"
		android:background="@android:color/transparent"
		android:orientation="vertical" >

		<ListView
		android:id="@android:id/list"
		android:layout_width="match_parent"
		android:layout_height="0px"
		android:layout_weight="1"
		android:cacheColorHint="@android:color/transparent"
		android:clipToPadding="false"
		android:drawSelectorOnTop="false"
		android:paddingTop="0dip"
		android:scrollbarAlwaysDrawVerticalTrack="true" />

		<TextView
		android:id="@android:id/empty"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="center"
		android:visibility="gone" />

		<RelativeLayout
		android:id="@+id/button_bar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="0"
		android:visibility="gone" >

		<Button
		android:id="@+id/back_button"
		android:layout_width="150dip"
		android:layout_height="wrap_content"
		android:layout_alignParentLeft="true"
		android:layout_margin="5dip"
		android:text="@string/wifi_setup_back" />

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true"
		android:orientation="horizontal" >

		<Button
		android:id="@+id/skip_button"
		android:layout_width="150dip"
		android:layout_height="wrap_content"
		android:layout_margin="5dip"
		android:text="@string/wifi_setup_skip"
		android:visibility="gone" />

		<Button
		android:id="@+id/next_button"
		android:layout_width="150dip"
		android:layout_height="wrap_content"
		android:layout_margin="5dip"
		android:text="@string/wifi_setup_next" />
		</LinearLayout>
		</RelativeLayout>
		</LinearLayout>
		</view>
		No newline at end of file

res/values-sw600dp/dimens.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -25,4 +25,9 @@
		<dimen name="content_margin_left">16dip</dimen>
		<dimen name="description_margin_top">26dip</dimen>
		<dimen name="crypt_clock_size">120sp</dimen>
		<dimen name="setup_title_size">60sp</dimen>
		<item type="dimen" name="setup_title_height">20%</item>
		<item type="dimen" name="setup_border_width">10%</item>
		<dimen name="setup_margin_bottom">0dip</dimen>
		<dimen name="setup_button_size">48dip</dimen>
		</resources>

res/values/colors.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,4 +32,6 @@

		<color name="divider_color">#20ffffff</color>
		<color name="title_color">@android:color/holo_blue_light</color>
		<color name="setup_divider_color">#333333</color>

		</resources>
		No newline at end of file

res/values/dimens.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -36,4 +36,15 @@
		<dimen name="volume_seekbar_side_margin">8dip</dimen>

		<dimen name="crypt_clock_size">100sp</dimen>

		<item type="dimen" name="setup_title_height">15%</item>
		<item type="dimen" name="setup_border_width">5%</item>
		<dimen name="setup_margin_bottom">0dip</dimen>
		<dimen name="setup_title_size">25sp</dimen>
		<dimen name="setup_button_size">32dip</dimen>

		<dimen name="divider_height">3dip</dimen>
		<dimen name="divider_margin_top">6dip</dimen>
		<dimen name="divider_margin_bottom">7dip</dimen>

		</resources>