Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / android / java / res / layout / website_settings.xml

diff --git a/src/chrome/android/java/res/layout/website_settings.xml b/src/chrome/android/java/res/layout/website_settings.xml
index cb614ca..dcfdb58 100644 (file)
--- a/src/chrome/android/java/res/layout/website_settings.xml
+++ b/src/chrome/android/java/res/layout/website_settings.xml
@@ -8,31 +8,97 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal" >
-
-    <ImageView
-        android:id="@+id/website_settings_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    android:background="#ffffff"
+    android:orientation="vertical" >
 
     <LinearLayout
-        android:id="@+id/website_settings_text_layout"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingStart="@dimen/certificate_viewer_padding_thin" >
+        android:paddingEnd="@dimen/website_settings_popup_padding_sides"
+        android:paddingStart="@dimen/website_settings_popup_padding_sides" >
 
         <TextView
-            android:id="@+id/website_settings_headline"
-            android:layout_width="wrap_content"
+            android:id="@+id/website_settings_url"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="@dimen/certificate_viewer_padding_thin"
-            android:textStyle="bold" />
+            android:lineSpacingExtra="4dp"
+            android:paddingTop="16dp"
+            android:textColor="@color/website_settings_popup_url"
+            android:textSize="16dp"/>
 
         <TextView
-            android:id="@+id/website_settings_description"
+            android:id="@+id/website_settings_connection_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="3dp"
+            android:paddingTop="12dp"
+            android:textColor="#444444"
+            android:textSize="14dp" />
+
+        <Button
+            android:id="@+id/website_settings_copy_url_button"
+            android:background="?android:attr/selectableItemBackground"
+            android:layout_gravity="end"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="@dimen/website_settings_popup_button_height"
+            android:layout_marginEnd="@dimen/website_settings_popup_button_margin_sides"
+            android:layout_marginStart="@dimen/website_settings_popup_button_margin_sides"
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:paddingEnd="@dimen/website_settings_popup_button_padding_sides"
+            android:paddingStart="@dimen/website_settings_popup_button_padding_sides"
+            android:text="@string/page_info_copy_url_button"
+            android:textAllCaps="true"
+            android:textColor="#4184f3"
+            android:textSize="@dimen/website_settings_popup_button_text_size"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <!-- Horizontal separator -->
+    <View
+        android:id="@+id/website_settings_horizontal_separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="#e7e7e7" />
+
+    <LinearLayout
+        android:id="@+id/website_settings_lower_dialog_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="@dimen/website_settings_popup_padding_sides"
+        android:paddingEnd="@dimen/website_settings_popup_padding_sides" >
+
+        <LinearLayout
+            android:id="@+id/website_settings_permissions_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp" >
+
+            <Button
+                android:id="@+id/website_settings_site_settings_button"
+                android:background="?android:attr/selectableItemBackground"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/website_settings_popup_button_height"
+                android:layout_marginEnd="@dimen/website_settings_popup_button_margin_sides"
+                android:layout_marginStart="@dimen/website_settings_popup_button_margin_sides"
+                android:paddingEnd="@dimen/website_settings_popup_button_padding_sides"
+                android:paddingStart="@dimen/website_settings_popup_button_padding_sides"
+                android:text="@string/page_info_site_settings_button"
+                android:textAllCaps="true"
+                android:textColor="@color/website_settings_popup_button_text"
+                android:textSize="@dimen/website_settings_popup_button_text_size"
+                android:textStyle="bold" />
+        </FrameLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>