Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7

am: f766cc8

* commit 'f766cc83951fff0c26ca57b074693ef8a4775283':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: Iadbd090b2a15b91137e170b7a22827d7fb3293e0

AndroidManifest.xml

@@ -1293,7 +1293,7 @@
         </activity>
 
         <activity android:name="MonitoringCertInfoActivity"
-                android:label="@string/ssl_ca_cert_dialog_title"
+                android:label=""
                 android:theme="@style/Transparent"
                 android:excludeFromRecents="true"
                 android:taskAffinity="">

src/com/android/settings/MonitoringCertInfoActivity.java

@@ -41,10 +41,12 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe
         DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);
         final int numberOfCertificates = getIntent().getIntExtra(
                 Settings.EXTRA_NUMBER_OF_CERTIFICATES, 1);
+        final CharSequence title = getResources().getQuantityText(
+                R.plurals.ssl_ca_cert_dialog_title, numberOfCertificates);
+        setTitle(title);
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(getResources().getQuantityText(R.plurals.ssl_ca_cert_dialog_title,
-                numberOfCertificates));
+        builder.setTitle(title);
         builder.setCancelable(true);
         builder.setPositiveButton(getResources().getQuantityText(
                 R.plurals.ssl_ca_cert_settings_button, numberOfCertificates) , this);