Add connection info popup within Page Info on Android.

chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 365 matching lines @@
         mDeprecatedSHA1Present = ToolbarModel.isDeprecatedSHA1Present(mWebContents);
 
         SpannableStringBuilder urlBuilder = new SpannableStringBuilder(mFullUrl);
         OmniboxUrlEmphasizer.emphasizeUrl(urlBuilder, mContext.getResources(), mProfile,
                 mSecurityLevel, mIsInternalPage, true);
         mUrlTitle.setText(urlBuilder);
 
         // Set the URL connection message now, and the URL after layout (so it
         // can calculate its ideal height).
         mUrlConnectionMessage.setText(getUrlConnectionMessage());
+        if (isConnectionDetailsLinkVisible()) mUrlConnectionMessage.setOnClickListener(this);
     }
 
     /**
      * Sets the visibility of the lower area of the dialog (containing the permissions and 'Site
      * Settings' button).
      *
      * @param isVisible Whether to show or hide the dialog area.
      */
     private void setVisibilityOfLowerDialogArea(boolean isVisible) {
         mHorizontalSeparator.setVisibility(isVisible ? View.VISIBLE : View.GONE);
@@ skipping 51 matching lines @@
             case ToolbarModelSecurityLevel.SECURITY_WARNING:
             case ToolbarModelSecurityLevel.SECURITY_POLICY_WARNING:
                 return R.string.page_info_connection_mixed;
             default:
                 assert false : "Invalid security level specified: " + toolbarModelSecurityLevel;
                 return R.string.page_info_connection_http;
         }
     }
 
     /**
+     * Whether to show a 'Details' link to the connection info popup. The link is only shown for
+     * HTTPS connections.
+     */
+    private boolean isConnectionDetailsLinkVisible() {
+        return !mIsInternalPage && mSecurityLevel != ToolbarModelSecurityLevel.NONE;
+    }
+
+    /**
      * Gets the styled connection message to display below the URL.
      */
     private Spannable getUrlConnectionMessage() {
         // Display the appropriate connection message.
         SpannableStringBuilder messageBuilder = new SpannableStringBuilder();
         if (mDeprecatedSHA1Present) {
             messageBuilder.append(
                     mContext.getResources().getString(R.string.page_info_connection_sha1));
         } else if (mSecurityLevel != ToolbarModelSecurityLevel.SECURITY_ERROR) {
             messageBuilder.append(mContext.getResources().getString(
@@ skipping 14 matching lines @@
                     R.string.page_info_connection_broken_following_text, originToDisplay);
             messageBuilder.append(leadingText + " " + followingText);
             final ForegroundColorSpan redSpan = new ForegroundColorSpan(mContext.getResources()
                     .getColor(R.color.website_settings_connection_broken_leading_text));
             final StyleSpan boldSpan = new StyleSpan(android.graphics.Typeface.BOLD);
             messageBuilder.setSpan(redSpan, 0, leadingText.length(),
                     Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
             messageBuilder.setSpan(boldSpan, 0, leadingText.length(),
                     Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
         }
+
+        if (isConnectionDetailsLinkVisible()) {
+            String detailsText = mContext.getResources().getString(R.string.page_info_details_link);
+            messageBuilder.append(" ");

[Ted C, 2015/04/27 19:04:01]

I "assume" this is fine since we do similar things above about all languages. 
It's a separate sentence, do I think it is ok, but still makes me wary.

+            int start = messageBuilder.length();
+            messageBuilder.append(detailsText);
+            final ForegroundColorSpan blueSpan = new ForegroundColorSpan(
+                    mContext.getResources().getColor(R.color.website_settings_popup_text_link));

[Ted C, 2015/04/27 19:04:01]

can the span not be applied prior to appending the text?  just wondering if you
can build the detailsText as a Spannable string and just plop it on the end.

[tsergeant, 2015/04/28 03:15:00]

Done.

+            messageBuilder.setSpan(
+                    blueSpan, start, messageBuilder.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+        }
+
         return messageBuilder;
     }
 
     /**
      * Adds a new row for the given permission.
      *
      * @param name The title of the permission to display to the user.
      * @param type The ContentSettingsType of the permission.
      * @param currentSetting The ContentSetting of the currently selected setting.
      */
@@ skipping 101 matching lines @@
         if (view == mCopyUrlButton) {
             new Clipboard(mContext).setText(mFullUrl, mFullUrl);
             mDialog.dismiss();
         } else if (view == mSiteSettingsButton) {
             // TODO(sashab,finnur): Make this open the Website Settings dialog.
             assert false : "No Website Settings here!";
             mDialog.dismiss();
         } else if (view == mUrlTitle) {
             // Expand/collapse the displayed URL title.
             mUrlTitle.toggleTruncation();
+        } else if (view == mUrlConnectionMessage) {
+            if (DeviceFormFactor.isTablet(mContext)) {
+                ConnectionInfoPopup.show(mContext, mWebContents);
+            } else {
+                // Delay while the WebsiteSettingsPopup closes.
+                mContainer.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        ConnectionInfoPopup.show(mContext, mWebContents);
+                    }
+                }, FADE_DURATION + CLOSE_CLEANUP_DELAY);
+            }
+            mDialog.dismiss();
         }
     }
 
     /**
      * Create a list of all the views which we want to individually fade in.
      */
     private List<View> collectAnimatableViews() {
         List<View> animatableViews = new ArrayList<View>();
         animatableViews.add(mUrlTitle);
         animatableViews.add(mUrlConnectionMessage);
@@ skipping 95 matching lines @@
         new WebsiteSettingsPopup(context, profile, webContents);
     }
 
     private static native long nativeInit(WebsiteSettingsPopup popup, WebContents webContents);
 
     private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid);
 
     private native void nativeOnPermissionSettingChanged(long nativeWebsiteSettingsPopupAndroid,
             int type, int setting);
 }