Index: chrome/android/java/res/layout/password_entry_editor.xml |
diff --git a/chrome/android/java/res/layout/password_entry_editor.xml b/chrome/android/java/res/layout/password_entry_editor.xml |
index bf79a3b5a763ca4158b3c2491f5e5689f623fac0..45d438d77a4e1f5450c137e6febcc52dd6f25ea5 100644 |
--- a/chrome/android/java/res/layout/password_entry_editor.xml |
+++ b/chrome/android/java/res/layout/password_entry_editor.xml |
@@ -9,71 +9,144 @@ |
android:fillViewport="true" > |
<LinearLayout |
+ android:id="@+id/password_entry_editor_1" |
android:layout_width="match_parent" |
android:layout_height="wrap_content" |
android:orientation="vertical" |
android:title="@string/password_entry_editor_title" > |
- |
+ |
<TextView |
- android:id="@+id/password_entry_editor_name" |
+ android:text="@string/password_entry_editor_link" |
+ android:textColor="@color/google_blue_700" |
android:layout_width="wrap_content" |
android:layout_height="wrap_content" |
- android:layout_margin="2dp" |
+ android:layout_marginTop="10dp" |
+ android:layout_marginStart="15dp" |
android:gravity="center_vertical" |
android:textAppearance="?android:attr/textAppearanceMedium" /> |
- |
+ |
+ <LinearLayout |
+ android:layout_width="wrap_content" |
+ android:layout_height="wrap_content" |
+ android:orientation="horizontal" |
+ android:weightSum="1" > |
+ |
+ <TextView |
+ android:id="@+id/password_entry_editor_url" |
+ android:textColor="@color/default_text_color" |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:layout_marginTop="10dp" |
+ android:layout_marginStart="15dp" |
+ android:textAppearance="?android:attr/textAppearanceMedium" /> |
+ |
+ <View |
+ android:layout_width="0dp" |
+ android:layout_height="0dp" |
+ android:layout_weight="1" /> |
+ |
+ <ImageButton |
+ style="?android:attr/buttonStyleSmall" |
+ android:layout_width="match_parent" |
+ android:layout_height="wrap_content" |
+ android:layout_gravity="end" |
+ android:layout_marginTop="10dp" |
+ android:layout_marginEnd="15dp" |
+ android:src="@drawable/clipboard_black" /> |
+ |
+ </LinearLayout> |
+ |
<TextView |
- android:id="@+id/password_entry_editor_url" |
+ android:text="@string/password_entry_editor_username" |
+ android:textColor="@color/google_blue_700" |
android:layout_width="wrap_content" |
android:layout_height="wrap_content" |
- android:layout_margin="2dp" |
+ android:layout_marginTop="5dp" |
+ android:layout_marginStart="15dp" |
android:gravity="center_vertical" |
android:textAppearance="?android:attr/textAppearanceMedium" /> |
- |
- <!-- Spacer to move the buttons to the bottom --> |
- |
- <View |
- android:layout_width="0dp" |
- android:layout_height="0dp" |
- android:layout_weight="1" |
- android:minHeight="5dp" /> |
- |
- <!-- Top border for the buttons --> |
- |
- <View |
- android:layout_width="match_parent" |
- android:layout_height="1dp" |
- android:background="?android:attr/dividerHorizontal" /> |
- |
- <!-- Save/Cancel/Delete buttons --> |
- |
+ |
<LinearLayout |
- style="?android:attr/buttonBarStyle" |
- android:layout_width="match_parent" |
+ android:layout_width="wrap_content" |
android:layout_height="wrap_content" |
- android:divider="?android:attr/dividerVertical" |
- android:dividerPadding="0dp" |
android:orientation="horizontal" |
- android:showDividers="middle" > |
- |
- <Button |
- android:id="@+id/password_entry_editor_delete" |
- style="?android:attr/buttonBarButtonStyle" |
+ android:weightSum="1" > |
+ |
+ <TextView |
+ android:id="@+id/password_entry_editor_name" |
+ android:textColor="@color/default_text_color" |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:layout_marginTop="10dp" |
+ android:layout_marginStart="15dp" |
+ android:textAppearance="?android:attr/textAppearanceMedium" /> |
+ |
+ <View |
+ android:layout_width="0dp" |
+ android:layout_height="0dp" |
+ android:layout_weight="1" /> |
+ |
+ <ImageButton |
+ style="?android:attr/buttonStyleSmall" |
android:layout_width="match_parent" |
- android:layout_height="match_parent" |
- android:layout_weight="1" |
- android:focusable="true" |
- android:text="@string/delete" /> |
- |
- <Button |
- android:id="@+id/password_entry_editor_cancel" |
- style="?android:attr/buttonBarButtonStyle" |
+ android:layout_height="wrap_content" |
+ android:layout_gravity="end" |
+ android:layout_marginTop="10dp" |
+ android:layout_marginEnd="15dp" |
+ android:src="@drawable/clipboard_black" /> |
+ |
+ </LinearLayout> |
+ |
+ <TextView |
+ android:text="@string/password_entry_editor_password" |
+ android:textColor="@color/google_blue_700" |
+ android:layout_width="wrap_content" |
+ android:layout_height="wrap_content" |
+ android:layout_marginTop="5dp" |
+ android:layout_marginStart="15dp" |
+ android:gravity="center_vertical" |
+ android:textAppearance="?android:attr/textAppearanceMedium" /> |
+ |
+ <LinearLayout |
+ android:layout_width="wrap_content" |
+ android:layout_height="wrap_content" |
+ android:orientation="horizontal" |
+ android:weightSum="1" > |
+ |
+ <TextView |
+ android:id="@+id/password_entry_editor_password" |
+ android:textColor="@color/default_text_color" |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:layout_marginTop="10dp" |
+ android:layout_marginStart="15dp" |
+ android:textAppearance="?android:attr/textAppearanceMedium" /> |
+ |
+ <View |
+ android:layout_width="0dp" |
+ android:layout_height="0dp" |
+ android:layout_weight="1" /> |
+ |
+ <ImageButton |
+ style="?android:attr/buttonStyleSmall" |
+ android:layout_width="match_parent" |
+ android:layout_height="wrap_content" |
+ android:layout_gravity="end" |
+ android:layout_marginTop="10dp" |
+ android:layout_marginEnd="15dp" |
+ android:src="@drawable/eye_black" /> |
+ |
+ <ImageButton |
+ style="?android:attr/buttonStyleSmall" |
android:layout_width="match_parent" |
- android:layout_height="match_parent" |
- android:layout_weight="1" |
- android:focusable="true" |
- android:text="@string/cancel" /> |
+ android:layout_height="wrap_content" |
+ android:layout_gravity="end" |
+ android:layout_marginTop="10dp" |
+ android:layout_marginEnd="15dp" |
+ android:src="@drawable/clipboard_black" /> |
+ |
</LinearLayout> |
+ |
</LinearLayout> |
</ScrollView> |