diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-06-30 10:41:02 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-06-30 17:57:42 -0700 |
| commit | 91615cfa9ead46769ad3adc624b3bacb4906e4b2 (patch) | |
| tree | 1a8fea5e48ccf3c4565bd5c06dc0555f214d04c5 /src/com | |
| parent | 3fa13775e805df6cc7244d3f93105c5d3a5b748f (diff) | |
| download | packages_apps_settings-91615cfa9ead46769ad3adc624b3bacb4906e4b2.zip packages_apps_settings-91615cfa9ead46769ad3adc624b3bacb4906e4b2.tar.gz packages_apps_settings-91615cfa9ead46769ad3adc624b3bacb4906e4b2.tar.bz2 | |
Fix TrustedCredentialsSettings for small screens
Change-Id: I01149a88b044d0f95db01039aabba62666e8f397
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/TrustedCredentialsSettings.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index 340e93d..3e50440 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -309,7 +309,7 @@ public class TrustedCredentialsSettings extends Fragment { } private void showCertDialog(final CertHolder certHolder) { - View view = View.inflate(getActivity(), R.layout.trusted_credential_details, null); + View view = certHolder.mSslCert.inflateCertificateView(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(com.android.internal.R.string.ssl_certificate); builder.setView(view); @@ -320,10 +320,12 @@ public class TrustedCredentialsSettings extends Fragment { }); final Dialog certDialog = builder.create(); - FrameLayout details = (FrameLayout) view.findViewById(R.id.cert_details); - details.addView(certHolder.mSslCert.inflateCertificateView(getActivity())); - - Button removeButton = (Button) view.findViewById(R.id.cert_remove_button); + ViewGroup body = (ViewGroup) view.findViewById(com.android.internal.R.id.body); + LayoutInflater inflater = LayoutInflater.from(getActivity()); + Button removeButton = (Button) inflater.inflate(R.layout.trusted_credential_details, + body, + false); + body.addView(removeButton); removeButton.setText(certHolder.mTab.getButtonLabel(certHolder)); removeButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { |