Settings: Regulatory: Fullscreen instead of AlertDialog

* Also adapt S style
* ScrollView -> NestedScrollView
* Remove unnecessary DialogInterface

Change-Id: I38dd316cce28104f42dd261982dea1bf2eb87eab

AndroidManifest.xml

@@ -3489,6 +3489,7 @@
             android:name="RegulatoryInfoDisplayActivity"
             android:label="@string/regulatory_labels"
             android:exported="true"
+            android:theme="@style/Theme.SubSettingsBase"
             android:enabled="@bool/config_show_regulatory_info">
             <intent-filter>
                 <action android:name="android.settings.SHOW_REGULATORY_INFO" />

res/layout/regulatory_info.xml

@@ -13,9 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fillViewport="true" >
+
     <ImageView
         android:id="@+id/regulatoryInfo"
         android:adjustViewBounds="true"
@@ -24,5 +27,5 @@
         android:scaleType="centerCrop"
         android:contentDescription="@string/regulatory_labels"
         android:src="@drawable/regulatory_info" />
-</ScrollView>
 
+</androidx.core.widget.NestedScrollView>

src/com/android/settings/RegulatoryInfoDisplayActivity.java

@@ -16,8 +16,6 @@
 
 package com.android.settings;
 
-import android.app.Activity;
-import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -31,7 +29,8 @@
 import android.widget.TextView;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
+
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 
 import java.util.Locale;
 
@@ -45,8 +44,7 @@
  * or add a string resource named "regulatory_info_text" with an HTML version of the required
  * information (text will be centered in the dialog).
  */
-public class RegulatoryInfoDisplayActivity extends Activity implements
-        DialogInterface.OnDismissListener {
+public class RegulatoryInfoDisplayActivity extends CollapsingToolbarBaseActivity {
 
     private final String REGULATORY_INFO_RESOURCE = "regulatory_info";
     private static final String DEFAULT_REGULATORY_INFO_FILEPATH =
@@ -60,11 +58,6 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                .setTitle(R.string.regulatory_labels)
-                .setOnDismissListener(this)
-                .setPositiveButton(android.R.string.ok, null /* onClickListener */);
-
         boolean regulatoryInfoDrawableExists = false;
 
         final String regulatoryInfoFile = getRegulatoryInfoImageFileName();
@@ -101,14 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
             } else {
                 image.setImageResource(resId);
             }
-            builder.setView(view);
-            builder.show();
-        } else if (regulatoryText.length() > 0) {
-            builder.setMessage(regulatoryText);
-            AlertDialog dialog = builder.show();
-            // we have to show the dialog first, or the setGravity() call will throw a NPE
-            TextView messageText = (TextView) dialog.findViewById(android.R.id.message);
-            messageText.setGravity(Gravity.CENTER);
+            setContentView(view);
         } else {
             // neither drawable nor text resource exists, finish activity
             finish();
@@ -146,11 +132,6 @@ int getResourceId() {
         return resId;
     }
 
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        finish();   // close the activity
-    }
-
     private String getCoo() {
         return SystemProperties.get("ro.boot.hardware.coo", "");
     }