Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ad8d93c

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

Change-Id: I82a727d2c3f436f6292f6c7f4a12c5d0f7853bdb
This commit is contained in:
Victor Chang
2016-04-19 18:49:26 +00:00
committed by android-build-merger
parent 0a8d0350b9 ad8d93ce4f
commit 9c751b518f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

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

6
src/com/android/settings/MonitoringCertInfoActivity.java
View File

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