| Index: chrome/android/java/res/layout/autofill_dialog_content.xml
|
| diff --git a/chrome/android/java/res/layout/autofill_dialog_content.xml b/chrome/android/java/res/layout/autofill_dialog_content.xml
|
| index 245c25a236f41a2b039219b330625f8785ce0547..7b804ad187e7ae18e6dab70758c6f3be00b06c49 100644
|
| --- a/chrome/android/java/res/layout/autofill_dialog_content.xml
|
| +++ b/chrome/android/java/res/layout/autofill_dialog_content.xml
|
| @@ -4,31 +4,63 @@
|
| Use of this source code is governed by a BSD-style license that can be
|
| found in the LICENSE file.
|
| -->
|
| -<org.chromium.chrome.browser.autofill.AutofillDialogContentView xmlns:android="http://schemas.android.com/apk/res/android"
|
| - android:layout_width="wrap_content"
|
| - android:layout_height="wrap_content">
|
| +<org.chromium.chrome.browser.autofill.AutofillDialogView xmlns:android="http://schemas.android.com/apk/res/android"
|
| + android:layout_width="match_parent"
|
| + android:layout_height="wrap_content"
|
| + android:minWidth="@dimen/autofill_dialog_width"
|
| + android:minHeight="@dimen/autofill_dialog_max_height_portrait"
|
| + android:gravity="center">
|
| <!--TODO(yusufo):Add accessibility content description for all actionable items-->
|
| - <include layout="@layout/autofill_general_layout"/>
|
| - <include layout="@layout/autofill_editing_layout_email"/>
|
| - <include layout="@layout/autofill_editing_layout_credit_card"/>
|
| - <include layout="@layout/autofill_editing_layout_shipping"/>
|
| + <include layout="@layout/autofill_dialog_title"/>
|
| + <ScrollView
|
| + android:id="@+id/content"
|
| + android:layout_width="match_parent"
|
| + android:layout_height="wrap_content">
|
| + <FrameLayout
|
| + android:layout_width="match_parent"
|
| + android:layout_height="wrap_content">
|
| + <include layout="@layout/autofill_general_layout"/>
|
| + <include layout="@layout/autofill_editing_layout_email"/>
|
| + <include layout="@layout/autofill_editing_layout_credit_card"/>
|
| + <include layout="@layout/autofill_editing_layout_shipping"/>
|
| + <LinearLayout
|
| + android:layout_width="match_parent"
|
| + android:layout_height="match_parent"
|
| + android:id="@+id/loading_icon"
|
| + android:visibility="gone"
|
| + android:gravity="center"
|
| + android:orientation="vertical">
|
| + <ProgressBar
|
| + android:layout_marginTop="30dp"
|
| + android:layout_width="48dp"
|
| + android:layout_height="48dp"
|
| + android:indeterminate="true"/>
|
| + <TextView
|
| + android:layout_margin="20dp"
|
| + android:layout_width="wrap_content"
|
| + android:layout_height="wrap_content"
|
| + android:text="@string/autofill_fetch_message" />
|
| + </LinearLayout>
|
| + </FrameLayout>
|
| + </ScrollView>
|
| <LinearLayout
|
| + android:id="@+id/footer"
|
| android:layout_width="match_parent"
|
| - android:layout_height="match_parent"
|
| - android:id="@+id/loading_icon"
|
| - android:visibility="gone"
|
| - android:gravity="center"
|
| - android:orientation="vertical">
|
| - <TextView
|
| - android:layout_marginTop="24dp"
|
| - android:layout_width="wrap_content"
|
| - android:layout_height="wrap_content"
|
| - android:text="@string/autofill_fetch_message" />
|
| - <ProgressBar
|
| - android:layout_marginTop="24dp"
|
| - android:layout_marginBottom="32dp"
|
| - android:layout_width="48dp"
|
| - android:layout_height="48dp"
|
| - android:indeterminate="true"/>
|
| + android:layout_height="@dimen/autofill_dialog_footer_height"
|
| + android:minHeight="@dimen/autofill_dialog_footer_height">
|
| + <Button
|
| + android:id="@+id/negative_button"
|
| + android:layout_width="0dp"
|
| + android:layout_weight="0.5"
|
| + android:layout_height="@dimen/autofill_dialog_footer_height"
|
| + android:background = "?android:attr/selectableItemBackground"
|
| + android:visibility="gone"/>
|
| + <Button
|
| + android:id="@+id/positive_button"
|
| + android:layout_width="0dp"
|
| + android:layout_weight="0.5"
|
| + android:layout_height="@dimen/autofill_dialog_footer_height"
|
| + android:background = "?android:attr/selectableItemBackground"
|
| + android:visibility="gone"/>
|
| </LinearLayout>
|
| -</org.chromium.chrome.browser.autofill.AutofillDialogContentView>
|
| +</org.chromium.chrome.browser.autofill.AutofillDialogView>
|
|
|