Merge "fix the layout oddness that occurrs in portrait mode"

This commit is contained in:
Fred Quintana
2012-01-12 18:07:07 -08:00
committed by Android (Google) Code Review

View File

@@ -19,11 +19,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -39,11 +34,6 @@
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -60,6 +50,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/accounts_tester_get_all_accounts"/> android:text="@string/accounts_tester_get_all_accounts"/>
<Button android:id="@+id/accounts_tester_get_auth_token_by_type_and_feature"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/accounts_tester_get_auth_token_by_type_and_feature"/>
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/accounts_tester_add_account" <Button android:id="@+id/accounts_tester_add_account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -69,12 +70,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/accounts_tester_edit_properties"/> android:text="@string/accounts_tester_edit_properties"/>
<Button android:id="@+id/accounts_tester_get_auth_token_by_type_and_feature"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/accounts_tester_get_auth_token_by_type_and_feature"/>
</LinearLayout> </LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -108,17 +103,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minEms="15"/> android:minEms="15"/>
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ListView android:id="@+id/accounts_tester_accounts_list" <ListView android:id="@+id/accounts_tester_accounts_list"
android:layout_width="match_parent" android:layout_height="match_parent"/> android:layout_width="match_parent" android:layout_height="match_parent"/>
</LinearLayout>
</LinearLayout> </LinearLayout>