commit 36ccdd4be488b307eed895159147c2a44a5eedca
author Alex Johnston <acjohnston@google.com> Tue Apr 28 16:37:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 28 16:37:37 2020 +0000
tree c4ad91441d2743d200ff3e20d5bb05362a1aea8f
parent 1ab6907da50a17ff65810292e058bccdab3bd7af
parent 7f21f51f0d4730f78aabaf2128475034b0949780

Modify name certificate dialog am: 19cba1ef10 am: d156dbb3cc am: 7f21f51f0d

Change-Id: I8328a35dc566aa449190a1f0f3acf4467125e9f2

res/layout/name_certificate_dialog.xml

diff --git a/res/layout/name_certificate_dialog.xml b/res/layout/name_certificate_dialog.xml
index c838ba8..baa15d9 100644
--- a/res/layout/name_certificate_dialog.xml
+++ b/res/layout/name_certificate_dialog.xml
@@ -24,11 +24,6 @@
             android:layout_height="wrap_content"
             android:padding="16dp">
 
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:text="@string/name_credential_dialog_title"
-                  style="@style/dialog_title"/>
-
         <TextView android:id="@+id/error"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"

src/com/android/certinstaller/CertInstaller.java

diff --git a/src/com/android/certinstaller/CertInstaller.java b/src/com/android/certinstaller/CertInstaller.java
index a487180..656715f 100644
--- a/src/com/android/certinstaller/CertInstaller.java
+++ b/src/com/android/certinstaller/CertInstaller.java
@@ -458,6 +458,7 @@
 
         Dialog d = new AlertDialog.Builder(this)
                 .setView(view)
+                .setTitle(R.string.name_credential_dialog_title)
                 .setPositiveButton(android.R.string.ok, (dialog, id) -> {
                     String name = mView.getText(R.id.certificate_name);
                     if (TextUtils.isEmpty(name)) {