Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4326)

Unified Diff: chrome/android/java/res/layout/autofill_general_layout.xml

Issue 14886012: Implement layout transition animations for the Autofill dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Got rid of TABs Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/res/layout/autofill_general_layout.xml
diff --git a/chrome/android/java/res/layout/autofill_general_layout.xml b/chrome/android/java/res/layout/autofill_general_layout.xml
index 28707855945e2badf2e6d3a85eed646f1d20276a..40255f6ca9ef0a6cb355493b548a0441c87efbb0 100644
--- a/chrome/android/java/res/layout/autofill_general_layout.xml
+++ b/chrome/android/java/res/layout/autofill_general_layout.xml
@@ -4,136 +4,127 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/general_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:columnCount="4">
+ android:orientation="vertical">
<CheckBox
android:id="@+id/top_checkbox_notification"
- android:layout_columnSpan="4"
- android:layout_gravity="fill_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/autofill_edit_height"
android:layout_marginLeft="@dimen/autofill_steady_margin"
android:layout_marginRight="@dimen/autofill_steady_margin"
android:textSize="@dimen/autofill_notification_text_size"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/top_notifications"
- android:layout_columnSpan="4"
- android:layout_gravity="fill_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/autofill_steady_margin"
android:layout_marginRight="@dimen/autofill_steady_margin"
android:orientation="vertical"
android:visibility="gone"/>
<TextView
android:id="@+id/cc_billing_label"
- android:layout_columnSpan="2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/autofill_steady_margin"
android:textSize="@dimen/autofill_steady_text_size"
android:textStyle="bold"/>
- <Space
- android:layout_columnSpan="2"
- android:layout_gravity="fill"/>
<Spinner
android:id="@+id/cc_billing_spinner"
- android:layout_columnSpan="4"
- android:layout_gravity="fill_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/autofill_edit_height"
android:layout_margin="@dimen/autofill_steady_margin"
android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
android:padding="@dimen/autofill_menu_item_padding"/>
<TextView
android:id="@+id/cc_label"
- android:layout_columnSpan="2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/autofill_steady_margin"
android:textSize="@dimen/autofill_steady_text_size"
android:textStyle="bold"/>
- <Space
- android:layout_columnSpan="2"
- android:layout_gravity="fill"/>
<Spinner
android:id="@+id/cc_spinner"
- android:layout_columnSpan="4"
- android:layout_gravity="fill_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/autofill_edit_height"
android:layout_margin="@dimen/autofill_steady_margin"
android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
android:padding="@dimen/autofill_menu_item_padding"/>
<TextView
android:id="@+id/billing_label"
- android:layout_columnSpan="2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/autofill_steady_margin"
android:textSize="@dimen/autofill_steady_text_size"
android:textStyle="bold"/>
- <Space
- android:layout_columnSpan="2"
- android:layout_gravity="fill"/>
<Spinner
android:id="@+id/billing_spinner"
- android:layout_columnSpan="4"
- android:layout_gravity="fill_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/autofill_edit_height"
android:layout_margin="@dimen/autofill_steady_margin"
android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
android:padding="@dimen/autofill_menu_item_padding"
android:visibility="gone"/>
<TextView
android:id="@+id/shipping_label"
- android:layout_columnSpan="2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/autofill_steady_margin"
android:textSize="@dimen/autofill_steady_text_size"
android:textStyle="bold"/>
- <Space
- android:layout_columnSpan="2"
- android:layout_gravity="fill"/>
<Spinner
android:id="@+id/address_spinner"
- android:layout_columnSpan="4"
- android:layout_gravity="fill_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/autofill_edit_height"
android:layout_margin="@dimen/autofill_steady_margin"
android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
android:padding="@dimen/autofill_menu_item_padding"/>
<TextView
android:id="@+id/email_label"
- android:layout_columnSpan="2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/autofill_steady_margin"
android:textSize="@dimen/autofill_steady_text_size"
android:textStyle="bold"/>
- <Space
- android:layout_columnSpan="2"
- android:layout_gravity="fill"/>
<Spinner
android:id="@+id/email_spinner"
- android:layout_columnSpan="4"
- android:layout_gravity="fill_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/autofill_edit_height"
android:layout_margin="@dimen/autofill_steady_margin"
android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
android:padding="@dimen/autofill_menu_item_padding"/>
<CheckBox
android:id="@+id/save_locally_checkbox"
- android:layout_columnSpan="4"
- android:layout_gravity="fill_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/autofill_edit_height"
android:layout_marginLeft="@dimen/autofill_steady_margin"
android:layout_marginRight="@dimen/autofill_steady_margin"
android:textSize="@dimen/autofill_notification_text_size"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/bottom_notifications"
- android:layout_columnSpan="4"
- android:layout_gravity="fill_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/autofill_steady_margin"
android:layout_marginRight="@dimen/autofill_steady_margin"
android:orientation="vertical"
android:visibility="gone"/>
<View
android:id="@+id/line_bottom"
- android:layout_columnSpan="4"
+ android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#D9D9DC"/>
<Button
android:id="@+id/terms_info"
- android:layout_columnSpan="4"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:gravity="left"
android:padding="10dp"
android:text="@string/autofill_terms_of_service"
android:textSize="@dimen/autofill_notification_text_size"
android:visibility="gone"/>
-</GridLayout>
+</LinearLayout>

Powered by Google App Engine
This is Rietveld 408576698