commit fc6bc20161edea9e93a7abcd82af5c26870c58bb
author Geoffrey Borggaard <geoffreyb@google.com> Fri Aug 09 11:44:42 2013 -0400
committer Geoffrey Borggaard <geoffreyb@google.com> Fri Aug 09 16:21:08 2013 -0400
tree a905025ec54054c0ed86ac4fc65391aeb73fd429
parent f3796d0bf8bfa3a0e4359dcdf4017961bd312dea

Allow navigation to TrustedCredentials User Certs by intent.

Adds an activity, and an entry in the AndroidManifest.xml

Change-Id: Ic3cfa1f3bdc3f2eefc290195679011c224496d63

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index a9d35a2..cd306fc 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -334,6 +334,7 @@
         NotificationAccessSettings.class.getName(),
         ManageAccountsSettings.class.getName(),
         PrintingSettings.class.getName(),
+        TrustedCredentialsSettings.class.getName()
     };
 
     @Override
@@ -958,4 +959,5 @@
     public static class NotificationAccessSettingsActivity extends Settings { /* empty */ }
     public static class UsbSettingsActivity extends Settings { /* empty */ }
     public static class NfcPaymentActivity extends Settings { /* empty */ }
+    public static class TrustedCredentialsSettingsActivity extends Settings { /* empty */ }
 }

src/com/android/settings/TrustedCredentialsSettings.java

diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index b3716e3..3e3d5a3 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -58,6 +58,8 @@
 
     private UserManager mUserManager;
 
+    private static final String USER_ACTION = "com.android.settings.TRUSTED_CREDENTIALS_USER";
+
     private static final int REQUEST_PIN_CHALLENGE = 12309;
     // If the restriction PIN is entered correctly.
     private boolean mChallengeSucceeded;
@@ -168,6 +170,10 @@
         addTab(Tab.SYSTEM);
         // TODO add Install button on Tab.USER to go to CertInstaller like KeyChainActivity
         addTab(Tab.USER);
+        if (getActivity().getIntent() != null &&
+                USER_ACTION.equals(getActivity().getIntent().getAction())) {
+            mTabHost.setCurrentTabByTag(Tab.USER.mTag);
+        }
         return mTabHost;
     }