Fix accessibility support for MD incognito NTP

Use TextViewWithClickableSpan for the subtitle text so that it responds
to accessibility events when the learn more link is appended to the end.
Also update the XML to make the root view focusable instead of the
scroll view, which fixes an issue where focus was previously going to a
child of the ScrollView instead of the container.

BUG=894844,757017

Change-Id: I737d3aa8cbe03064caa95065a6ce07ba41e6194e
Reviewed-on: https://chromium-review.googlesource.com/c/1278797
Commit-Queue: Theresa <twellington@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599287}

chrome/android/java/res/layout/new_tab_page_incognito.xml

@@ -8,7 +8,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ntp_content"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:contentDescription="@string/accessibility_new_incognito_tab_page" >
 
     <org.chromium.chrome.browser.ntp.NewTabPageScrollView
         android:id="@+id/ntp_scrollview"
@@ -17,10 +20,7 @@
         android:layout_height="match_parent"
         android:fadingEdgeLength="9dp"
         android:fillViewport="false"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:requiresFadingEdge="vertical"
-        android:contentDescription="@string/accessibility_new_incognito_tab_page" >
+        android:requiresFadingEdge="vertical" >
 
         <LinearLayout
             android:id="@+id/new_tab_incognito_container"

chrome/android/java/res/layout/new_tab_page_incognito_md.xml

@@ -8,7 +8,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ntp_content"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:contentDescription="@string/accessibility_new_incognito_tab_page" >
 
     <org.chromium.chrome.browser.ntp.NewTabPageScrollView
         android:id="@+id/ntp_scrollview"
@@ -17,10 +20,7 @@
         android:layout_height="match_parent"
         android:fadingEdgeLength="9dp"
         android:fillViewport="false"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:requiresFadingEdge="vertical"
-        android:contentDescription="@string/accessibility_new_incognito_tab_page" >
+        android:requiresFadingEdge="vertical" >
 
         <LinearLayout
             android:id="@+id/new_tab_incognito_container"
@@ -44,7 +44,7 @@
                 android:text="@string/new_tab_otr_title"
                 android:textAppearance="@style/WhiteHeadline" />
 
-            <TextView
+            <org.chromium.ui.widget.TextViewWithClickableSpans
                 android:id="@+id/new_tab_incognito_subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,8 +78,6 @@
                 android:id="@+id/learn_more"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:clickable="true"
-                android:focusable="true"
                 android:text="@string/learn_more"
                 android:textAppearance="@style/TextAppearance.IncognitoNewTabLearnMoreLinkModern"
                 android:lineSpacingExtra="@dimen/md_incognito_ntp_line_spacing" />

chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java

@@ -54,7 +54,7 @@ public class IncognitoNewTabPageView extends FrameLayout {
         mScrollView = (NewTabPageScrollView) findViewById(R.id.ntp_scrollview);
         mScrollView.setBackgroundColor(
                 ApiCompatibilityUtils.getColor(getResources(), R.color.ntp_bg_incognito));
-        mScrollView.setContentDescription(getResources().getText(
+        setContentDescription(getResources().getText(
                 ChromeFeatureList.isEnabled(ChromeFeatureList.INCOGNITO_STRINGS)
                         ? R.string.accessibility_new_private_tab_page
                         : R.string.accessibility_new_incognito_tab_page));

chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPageViewMD.java

@@ -239,7 +239,6 @@ public class IncognitoNewTabPageViewMD extends IncognitoNewTabPageView {
                 mContext.getResources().getString(R.string.new_tab_otr_subtitle);
         boolean learnMoreInSubtitle = mWidthDp > WIDE_LAYOUT_THRESHOLD_DP;
 
-        mSubtitle.setClickable(learnMoreInSubtitle);
         mLearnMore.setVisibility(learnMoreInSubtitle ? View.GONE : View.VISIBLE);
 
         if (!learnMoreInSubtitle) {