| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 | 3 |
| 4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
| 5 found in the LICENSE file. | 5 found in the LICENSE file. |
| 6 --> | 6 --> |
| 7 | 7 |
| 8 <!-- | 8 <!-- |
| 9 Defines all the widgets that each of the types of JS modal dialogs | 9 Defines all the widgets that each of the types of JS modal dialogs |
| 10 need (alerts, confirms and prompts). When we inflate the layout | 10 need (alerts, confirms and prompts). When we inflate the layout |
| 11 in JSModalDialogHolder we show hide the widgets we need as appropriate | 11 in JSModalDialogHolder we show hide the widgets we need as appropriate |
| 12 for the type of dialog we need to show. | 12 for the type of dialog we need to show. |
| 13 TODO(benm): Move this into the framework once we are integrated with the | 13 TODO(benm): Move this into the framework once we are integrated with the |
| 14 Android tree. | 14 Android tree. |
| 15 --> | 15 --> |
| 16 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" | 16 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
| 17 android:layout_width="match_parent" | 17 android:layout_width="match_parent" |
| 18 android:layout_height="match_parent"> | 18 android:layout_height="match_parent"> |
| 19 <LinearLayout | 19 <LinearLayout |
| 20 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
| 21 android:layout_height="match_parent" | 21 android:layout_height="match_parent" |
| 22 android:orientation="vertical" | 22 android:orientation="vertical" |
| 23 android:padding="5dip"> | 23 android:padding="5dip"> |
| 24 | 24 |
| 25 <TextView android:id="@+id/js_modal_dialog_title" | |
| 26 android:layout_width="wrap_content" | |
| 27 android:layout_height="wrap_content" | |
| 28 android:layout_marginBottom="5dip" | |
| 29 android:textAppearance="?android:attr/textAppearanceLarge" | |
| 30 /> | |
| 31 | |
| 32 <View | |
| 33 android:layout_height="1dip" | |
| 34 android:layout_width="match_parent" | |
| 35 android:background="@color/js_modal_dialog_title_separator" | |
| 36 android:layout_marginBottom="20dip" | |
| 37 /> | |
| 38 | |
| 39 <TextView android:id="@+id/js_modal_dialog_message" | |
| 40 android:layout_width="wrap_content" | |
| 41 android:layout_height="wrap_content" | |
| 42 android:textAppearance="?android:attr/textAppearanceMedium" | |
| 43 android:layout_marginBottom="5dip" | |
| 44 /> | |
| 45 | |
| 46 <EditText android:id="@+id/js_modal_dialog_prompt" | 25 <EditText android:id="@+id/js_modal_dialog_prompt" |
| 47 android:layout_width="match_parent" | 26 android:layout_width="match_parent" |
| 48 android:layout_height="wrap_content" | 27 android:layout_height="wrap_content" |
| 49 android:singleLine="true" | 28 android:singleLine="true" |
| 50 android:visibility="gone" | 29 android:visibility="gone" |
| 51 android:contentDescription="@string/accessibility_js_modal_dialog_pr
ompt" | 30 android:contentDescription="@string/accessibility_js_modal_dialog_pr
ompt" |
| 52 /> | 31 /> |
| 53 | 32 |
| 54 <CheckBox android:id="@+id/suppress_js_modal_dialogs" | 33 <CheckBox android:id="@+id/suppress_js_modal_dialogs" |
| 55 android:textAppearance="?android:attr/textAppearanceSmall" | 34 android:textAppearance="?android:attr/textAppearanceSmall" |
| 56 android:layout_width="match_parent" | 35 android:layout_width="match_parent" |
| 57 android:layout_height="wrap_content" | 36 android:layout_height="wrap_content" |
| 58 android:text="@string/suppress_js_modal_dialogs" | 37 android:text="@string/suppress_js_modal_dialogs" |
| 59 android:layout_gravity="left" | 38 android:layout_gravity="left" |
| 60 /> | 39 /> |
| 61 | 40 |
| 62 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
| 63 android:layout_width="match_parent" | |
| 64 android:layout_height="wrap_content" | |
| 65 android:orientation="horizontal" | |
| 66 > | |
| 67 <Button android:id="@+id/js_modal_dialog_button_cancel" | |
| 68 android:layout_width="wrap_content" | |
| 69 android:layout_height="wrap_content" | |
| 70 android:text="@string/js_modal_dialog_cancel" | |
| 71 android:layout_weight="1" | |
| 72 /> | |
| 73 <Button android:id="@+id/js_modal_dialog_button_confirm" | |
| 74 android:layout_width="wrap_content" | |
| 75 android:layout_height="wrap_content" | |
| 76 android:text="@string/js_modal_dialog_confirm" | |
| 77 android:layout_weight="1" | |
| 78 /> | |
| 79 </LinearLayout> | |
| 80 </LinearLayout> | 41 </LinearLayout> |
| 81 </ScrollView> | 42 </ScrollView> |
| OLD | NEW |