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

am 2d341782: am b213d30d: Merge "Polish layout and UI for wifi setup" into honeycomb

Browse Source 
* commit '2d34178259b0d135b9b815d4689ed8d3af4c74e6':
  Polish layout and UI for wifi setup
This commit is contained in:
Daisuke Miyakawa
2011-01-18 21:57:51 -08:00
committed by Android Git Automerger
parent cd88535c6e 2d34178259
commit c7e2ff7d69
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@
android:layout_width="wrap_content"
android:minWidth="406dip"
android:layout_height="wrap_content"
android:minHeight="176dip"
android:minHeight="160dip"
android:layout_alignParentLeft="true"
android:visibility="gone" />
<View

4
res/values/strings.xml
View File

@@ -3036,6 +3036,10 @@ found in the list of installed applications.</string>
saying EAP can't be configured in SetupWizard flow.
[CHAR LIMIT=NONE] -->
<string name="wifi_setup_eap_not_supported">You can\u0027t configure an EAP Wi-Fi connection during setup. After setup, you can do that in Settings, under Wireless &amp; Networks.</string>
<!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
<string name="wifi_setup_description_connecting">Connecting can take a few minutes...</string>
<!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
<string name="wifi_setup_description_connected">Touch <b>Next</b> to continue with setup.\n\nTouch <b>Back</b> to connect to a different Wi-Fi network.</string>
<!-- Do not translate. This is a stub which will be removed soon. -->
<string name="time_zone_auto_stub" translatable="false">Select Time Zone</string>