PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Follow naming conventions of proguard.flags"

Browse Source
This commit is contained in:
Brian Carlstrom
2011-06-28 20:05:46 -07:00
committed by Android (Google) Code Review
parent fe0be7fcbf ac45fb42b0
commit d1669eac43
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/security_settings_misc.xml
View File

@@ -59,7 +59,7 @@
<Preference android:title="@string/trusted_credentials" <Preference android:title="@string/trusted_credentials"
android:summary="@string/trusted_credentials_summary" android:summary="@string/trusted_credentials_summary"
android:persistent="false" android:persistent="false"
android:fragment="com.android.settings.TrustedCredentials"/> android:fragment="com.android.settings.TrustedCredentialsSettings"/>
<Preference android:title="@string/credentials_install" <Preference android:title="@string/credentials_install"
android:summary="@string/credentials_install_summary" android:summary="@string/credentials_install_summary"

4
src/com/android/settings/TrustedCredentials.java → src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -46,9 +46,9 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore; 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 { private enum Tab {
SYSTEM("system", SYSTEM("system",