wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1126608 - Make Site Identity text styling consistent with other doorhangers. r=ally

Browse Source
This commit is contained in:
Chenxia Liu 2015-04-21 17:36:56 -07:00
parent 93cfa3156c
commit 215b1386db
4 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mobile/android/base/resources/layout/site_identity.xml
View File

@ -34,47 +34,42 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/placeholder_active_grey"
android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"
android:text="@string/identity_connected_to"/>
<TextView android:id="@+id/host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:textColor="@color/placeholder_active_grey"
android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
android:textStyle="bold"/>
<TextView android:id="@+id/owner_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/placeholder_active_grey"
android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"
android:text="@string/identity_run_by"
android:paddingTop="12dip"/>
android:paddingTop="@dimen/doorhanger_section_padding_small"/>
<TextView android:id="@+id/owner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/placeholder_active_grey"
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
android:textStyle="bold"/>
<TextView android:id="@+id/verifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/placeholder_active_grey"
android:paddingTop="12dip"/>
android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"
android:paddingTop="@dimen/doorhanger_section_padding_small"/>
</LinearLayout>
<TextView android:id="@+id/site_settings_link"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.DoorHanger.Small"
android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
android:textColor="@color/link_blue"
android:paddingTop="@dimen/doorhanger_section_padding_small"
android:paddingBottom="@dimen/doorhanger_section_padding_small"
android:paddingTop="@dimen/doorhanger_section_padding_large"
android:paddingBottom="@dimen/doorhanger_padding"
android:text="@string/contextmenu_site_settings"/>
</LinearLayout>
</LinearLayout>

8
mobile/android/base/resources/layout/site_identity_unknown.xml
View File

@ -12,15 +12,13 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/placeholder_active_grey"
android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
android:text="@string/identity_no_info"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/placeholder_active_grey"
android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
android:text="@string/identity_not_encrypted"
android:paddingTop="12dip"/>
android:paddingTop="@dimen/doorhanger_section_padding_small"/>
</LinearLayout>

1
mobile/android/base/toolbar/SiteIdentityPopup.java
View File

@ -169,7 +169,6 @@ public class SiteIdentityPopup extends AnchoredPopup {
mMixedContentNotification = DoorHanger.Get(mContext, config);
mMixedContentNotification.setIcon(icon);
mContent.addView(mMixedContentNotification);
mDivider.setVisibility(View.VISIBLE);
}

5
mobile/android/base/widget/DoorHanger.java
View File

@ -100,11 +100,6 @@ public abstract class DoorHanger extends LinearLayout {
mIcon = (ImageView) findViewById(R.id.doorhanger_icon);
mMessage = (TextView) findViewById(R.id.doorhanger_message);
// TODO: Bug 1149359 - split this into DoorHanger subclasses.
if (type == Type.TRACKING || type == Type.MIXED_CONTENT) {
mMessage.setTextAppearance(getContext(), R.style.TextAppearance_DoorHanger_Small);
}
mType = type;
mButtonsContainer = (LinearLayout) findViewById(R.id.doorhanger_buttons);