diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-07-06 13:58:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-06 13:58:20 -0700 |
| commit | dc0282ad0a7f68d46c70e4e0af08a0ddc6bf6d44 (patch) | |
| tree | 983ec237874d3b53b0355553ecb0e4b1b9613e01 /src/com/android/browser | |
| parent | 76292ece64152959525f7f090af7b50cbb63bb88 (diff) | |
| parent | 0cda68a870051d9346ff70448c93dcde541ca173 (diff) | |
| download | packages_apps_Browser-dc0282ad0a7f68d46c70e4e0af08a0ddc6bf6d44.tar.gz packages_apps_Browser-dc0282ad0a7f68d46c70e4e0af08a0ddc6bf6d44.tar.bz2 packages_apps_Browser-dc0282ad0a7f68d46c70e4e0af08a0ddc6bf6d44.zip | |
Merge "Use correct placeholder ID for certificate view"
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/PageDialogsHandler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/browser/PageDialogsHandler.java b/src/com/android/browser/PageDialogsHandler.java index b39d863e8..015a9bb89 100644 --- a/src/com/android/browser/PageDialogsHandler.java +++ b/src/com/android/browser/PageDialogsHandler.java @@ -249,7 +249,7 @@ public class PageDialogsHandler { LayoutInflater factory = LayoutInflater.from(mContext); final LinearLayout placeholder = - (LinearLayout)certificateView.findViewById(R.id.placeholder); + (LinearLayout)certificateView.findViewById(com.android.internal.R.id.placeholder); LinearLayout ll = (LinearLayout) factory.inflate( R.layout.ssl_success, placeholder); @@ -304,7 +304,7 @@ public class PageDialogsHandler { LayoutInflater factory = LayoutInflater.from(mContext); final LinearLayout placeholder = - (LinearLayout)certificateView.findViewById(R.id.placeholder); + (LinearLayout)certificateView.findViewById(com.android.internal.R.id.placeholder); if (error.hasError(SslError.SSL_UNTRUSTED)) { LinearLayout ll = (LinearLayout)factory |