Commit c5d31f08 authored by Tatiana Gornak's avatar Tatiana Gornak Committed by Commit Bot

Handle long strings correctly in the password manager settings page on Android.

BUG=764061

Change-Id: I4d775b4543112d38076c8e0927e9f8756f31c5fd
Reviewed-on: https://chromium-review.googlesource.com/672523Reviewed-by: default avatarNicolas Dossou-Gbété <dgn@chromium.org>
Commit-Queue: Tatiana Gornak <melandory@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502880}
parent 2817c9d4
...@@ -5,33 +5,29 @@ ...@@ -5,33 +5,29 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/password_entry_editor_row_data" android:id="@+id/password_entry_editor_row_data"
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:layout_width="fill_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<View <ImageButton
android:layout_width="0dp" android:id="@+id/password_entry_editor_copy"
android:layout_height="0dp" android:background="@null"
android:layout_weight="1" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<ImageButton android:layout_gravity="end"
android:id="@+id/password_entry_editor_copy" android:layout_marginTop="15dp"
android:background="@null" android:layout_marginEnd="15dp"
android:layout_width="match_parent" android:src="@drawable/ic_content_copy"
android:layout_height="wrap_content" android:contentDescription="@string/password_entry_editor_copy_stored_username"
android:layout_gravity="end" style="?android:attr/buttonStyleSmall" />
android:layout_marginTop="15dp"
android:layout_marginEnd="15dp"
android:src="@drawable/ic_content_copy"
android:contentDescription="@string/password_entry_editor_copy_stored_username"
style="?android:attr/buttonStyleSmall" />
</LinearLayout> </LinearLayout>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
style="@style/PasswordEntryName" /> style="@style/PasswordEntryName" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/password_data" android:id="@+id/password_data"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -47,20 +47,16 @@ ...@@ -47,20 +47,16 @@
<TextView <TextView
android:id="@+id/password_entry_editor_password" android:id="@+id/password_entry_editor_password"
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:layout_width="fill_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageButton <ImageButton
android:id="@+id/password_entry_editor_view_password" android:id="@+id/password_entry_editor_view_password"
android:background="@null" android:background="@null"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
...@@ -72,7 +68,7 @@ ...@@ -72,7 +68,7 @@
<ImageButton <ImageButton
android:id="@+id/password_entry_editor_copy_password" android:id="@+id/password_entry_editor_copy_password"
android:background="@null" android:background="@null"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
...@@ -80,7 +76,6 @@ ...@@ -80,7 +76,6 @@
android:src="@drawable/ic_content_copy" android:src="@drawable/ic_content_copy"
android:contentDescription="@string/password_entry_editor_copy_stored_password" android:contentDescription="@string/password_entry_editor_copy_stored_password"
style="?android:attr/buttonStyleSmall" /> style="?android:attr/buttonStyleSmall" />
</LinearLayout> </LinearLayout>
<TextView <TextView
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment