Bug 1179509 - Include title + favicon in Site Identity doorhanger for unencrypted sites. r=ally
authorChenxia Liu <liuche@mozilla.com>
Wed, 01 Jul 2015 15:37:28 -0700
changeset 275829 d028004c974465b9a2419272ae70e0e4a527cfdd
parent 275828 d51f71a4ef4f0d4d1b11d81209edad4a13164bb6
child 275885 978016ea4a667c455a993c19f1e415a029f6bba9
push id3246
push usergijskruitbosch@gmail.com
push dateTue, 07 Jul 2015 09:06:38 +0000
reviewersally
bugs1179509
milestone42.0a1
Bug 1179509 - Include title + favicon in Site Identity doorhanger for unencrypted sites. r=ally
mobile/android/base/resources/layout/site_identity.xml
mobile/android/base/toolbar/SiteIdentityPopup.java
--- a/mobile/android/base/resources/layout/site_identity.xml
+++ b/mobile/android/base/resources/layout/site_identity.xml
@@ -19,30 +19,30 @@
                    android:src="@drawable/larry"
                    android:paddingRight="@dimen/doorhanger_section_padding_small"/>
 
         <LinearLayout android:layout_width="0dp"
                      android:layout_height="wrap_content"
                      android:orientation="vertical"
                      android:layout_weight="1.0">
 
+            <TextView android:id="@+id/site_identity_title"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_marginBottom="@dimen/doorhanger_subsection_padding"
+                      android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"/>
+
             <include layout="@layout/site_identity_unknown" />
 
             <LinearLayout android:id="@+id/site_identity_known_container"
                           android:layout_width="match_parent"
                           android:layout_height="wrap_content"
                           android:visibility="gone"
                           android:orientation="vertical">
 
-                <TextView android:id="@+id/site_identity_title"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginBottom="@dimen/doorhanger_subsection_padding"
-                          android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"/>
-
                 <TextView android:id="@+id/site_identity_encrypted"
                           android:layout_width="match_parent"
                           android:layout_height="wrap_content"
                           android:layout_marginBottom="@dimen/doorhanger_section_padding_small"
                           android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Bold"
                           android:textColor="@color/affirmative_green"
                           android:text="@string/identity_encrypted"/>
 
--- a/mobile/android/base/toolbar/SiteIdentityPopup.java
+++ b/mobile/android/base/toolbar/SiteIdentityPopup.java
@@ -105,17 +105,17 @@ public class SiteIdentityPopup extends A
         mContent.addView(mIdentity);
 
         mIdentityKnownContainer =
                 (LinearLayout) mIdentity.findViewById(R.id.site_identity_known_container);
         mIdentityUnknownContainer =
                 (LinearLayout) mIdentity.findViewById(R.id.site_identity_unknown_container);
 
 
-        mTitle = (TextView) mIdentityKnownContainer.findViewById(R.id.site_identity_title);
+        mTitle = (TextView) mIdentity.findViewById(R.id.site_identity_title);
         mEncrypted = (TextView) mIdentityKnownContainer.findViewById(R.id.site_identity_encrypted);
         mHost = (TextView) mIdentityKnownContainer.findViewById(R.id.host);
         mOwnerLabel = (TextView) mIdentityKnownContainer.findViewById(R.id.owner_label);
         mOwner = (TextView) mIdentityKnownContainer.findViewById(R.id.owner);
         mVerifier = (TextView) mIdentityKnownContainer.findViewById(R.id.verifier);
         mDivider = mIdentity.findViewById(R.id.divider_doorhanger);
 
         mSiteSettingsLink = (TextView) mIdentity.findViewById(R.id.site_settings_link);