commit d1669eac4378528b39eea3785a977a0d82fd54a0
author Brian Carlstrom <bdc@google.com> Tue Jun 28 20:05:46 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 28 20:05:46 2011 -0700
tree a56b1be1d34eb504f549a8b51bc98ae2da5162e1
parent fe0be7fcbfe4937133fe169e2f8d823dee7137ac
parent ac45fb42b00f377e58f8dfd59e4807a3147cfb57

Merge "Follow naming conventions of proguard.flags"

res/xml/security_settings_misc.xml

diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 3a88d0b..9f78820 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -59,7 +59,7 @@
         <Preference android:title="@string/trusted_credentials"
                 android:summary="@string/trusted_credentials_summary"
                 android:persistent="false"
-                android:fragment="com.android.settings.TrustedCredentials"/>
+                android:fragment="com.android.settings.TrustedCredentialsSettings"/>
 
         <Preference android:title="@string/credentials_install"
                 android:summary="@string/credentials_install_summary"

src/com/android/settings/TrustedCredentialsSettings.java

diff --git a/src/com/android/settings/TrustedCredentials.java b/src/com/android/settings/TrustedCredentialsSettings.java
similarity index 98%
rename from src/com/android/settings/TrustedCredentials.java
rename to src/com/android/settings/TrustedCredentialsSettings.java
index 987d2dc..340e93d 100644
--- a/src/com/android/settings/TrustedCredentials.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -46,9 +46,9 @@
 import java.util.Set;
 import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
 
-public class TrustedCredentials extends Fragment {
+public class TrustedCredentialsSettings extends Fragment {
 
-    private static final String TAG = "TrustedCredentials";
+    private static final String TAG = "TrustedCredentialsSettings";
 
     private enum Tab {
         SYSTEM("system",