summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2014-06-24 19:52:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-23 21:50:10 +0000
commitf13c783f6b91aeaa4528d9b003a600636750f6b4 (patch)
tree5b5dfd727baf341cc5ce26e52e37682f63bd75bd /res/layout
parent1f6d6a4953950d926e2137cac744360b071972d3 (diff)
parent432bd3aab156de1a0421f4f5589caeca6bad3140 (diff)
downloadpackages_apps_Settings-f13c783f6b91aeaa4528d9b003a600636750f6b4.zip
packages_apps_Settings-f13c783f6b91aeaa4528d9b003a600636750f6b4.tar.gz
packages_apps_Settings-f13c783f6b91aeaa4528d9b003a600636750f6b4.tar.bz2
Merge "[WifiSetup] Removed button bar"
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/setup_preference.xml47
1 files changed, 0 insertions, 47 deletions
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 195214f..c5d686f 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -72,7 +72,6 @@
</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"
@@ -148,52 +147,6 @@
</LinearLayout>
- <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_alignParentStart="true"
- 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"
- android:layout_alignParentEnd="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"
- android:visibility="gone" />
- </LinearLayout>
- </RelativeLayout>
</LinearLayout>
</view>
<fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"