Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04a01b7c authored by Victor Chang's avatar Victor Chang Committed by Android (Google) Code Review
Browse files

Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev

parents 43059b7e e8a46f28

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

+4 −2
Original line number Diff line number Diff line
@@ -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);