diff options
| author | Russell Brenner <russellbrenner@google.com> | 2012-09-27 11:37:54 -0700 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2012-09-28 10:51:31 -0700 |
| commit | 88c9f2889fafb53a2875418317ecd197d9aae883 (patch) | |
| tree | 7d562909f864afd052910f66e6069aae70fa0852 /res/layout | |
| parent | 990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c (diff) | |
| download | packages_apps_Settings-88c9f2889fafb53a2875418317ecd197d9aae883.zip packages_apps_Settings-88c9f2889fafb53a2875418317ecd197d9aae883.tar.gz packages_apps_Settings-88c9f2889fafb53a2875418317ecd197d9aae883.tar.bz2 | |
Show warnings when skipping Wi-Fi connection
If user skips over Wi-Fi, warn about possible carrier data charges or
inability to receive updates, depending on whether or not phone
service is available.
Note to translators: Some strings are being moved here from setup
wizard. They're tagged with their msgid's so as not to trigger
retranslation.
Bug: 7211786
Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/setup_preference.xml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml index 30b3373..c2f6989 100644 --- a/res/layout/setup_preference.xml +++ b/res/layout/setup_preference.xml @@ -30,7 +30,7 @@ android:gravity="bottom"> <LinearLayout - android:id="@+id/button_bar" + android:id="@+id/title_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignBottom="@id/title" @@ -62,7 +62,7 @@ <View android:id="@+id/top_divider" style="@style/TopDivider" - android:layout_below="@id/button_bar" /> + android:layout_below="@id/title_bar" /> </RelativeLayout> @@ -148,6 +148,14 @@ android:layout_margin="5dip" android:text="@string/wifi_setup_back" /> + <Button + android:id="@+id/custom_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_margin="5dip" + android:text="@string/wifi_setup_skip" /> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -167,8 +175,9 @@ android:layout_width="150dip" android:layout_height="wrap_content" android:layout_margin="5dip" - android:text="@string/wifi_setup_next" /> - </LinearLayout> + android:text="@string/wifi_setup_next" + android:visibility="gone" /> + </LinearLayout> </RelativeLayout> </LinearLayout> </view>
\ No newline at end of file |