Merge branch 'develop' into thumbnailOOM

[pub/Android/ownCloud.git] / res / layout / sso_dialog.xml

diff --git a/res/layout/sso_dialog.xml b/res/layout/sso_dialog.xml
index 788a0e2..652acb4 100644 (file)
--- a/res/layout/sso_dialog.xml
+++ b/res/layout/sso_dialog.xml
@@ -2,7 +2,7 @@
 <!--
   ownCloud Android client application
 
 <!--
   ownCloud Android client application
 

-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2015 ownCloud Inc.

 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,


@@ -21,13 +21,13 @@
     android:layout_height="wrap_content"
     >
     
     android:layout_height="wrap_content"
     >
     

-    <com.owncloud.android.ui.dialog.SsoWebView
+    <!--  com.owncloud.android.ui.dialog.SsoWebView

        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
         android:id="@+id/sso_webview"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:clickable="true"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
         android:id="@+id/sso_webview"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:clickable="true"

-        />
+        /-->

 
 </RelativeLayout>
 
 </RelativeLayout>