diff options
| author | Geoffrey Borggaard <geoffreyb@google.com> | 2013-08-09 11:44:42 -0400 |
|---|---|---|
| committer | Geoffrey Borggaard <geoffreyb@google.com> | 2013-08-09 16:21:08 -0400 |
| commit | fc6bc20161edea9e93a7abcd82af5c26870c58bb (patch) | |
| tree | a905025ec54054c0ed86ac4fc65391aeb73fd429 /src/com/android/settings/TrustedCredentialsSettings.java | |
| parent | f3796d0bf8bfa3a0e4359dcdf4017961bd312dea (diff) | |
| download | packages_apps_Settings-fc6bc20161edea9e93a7abcd82af5c26870c58bb.tar.gz packages_apps_Settings-fc6bc20161edea9e93a7abcd82af5c26870c58bb.tar.bz2 packages_apps_Settings-fc6bc20161edea9e93a7abcd82af5c26870c58bb.zip | |
Allow navigation to TrustedCredentials User Certs by intent.
Adds an activity, and an entry in the AndroidManifest.xml
Change-Id: Ic3cfa1f3bdc3f2eefc290195679011c224496d63
Diffstat (limited to 'src/com/android/settings/TrustedCredentialsSettings.java')
| -rw-r--r-- | src/com/android/settings/TrustedCredentialsSettings.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index b3716e36b..3e3d5a3d9 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -58,6 +58,8 @@ public class TrustedCredentialsSettings extends Fragment { 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 @@ public class TrustedCredentialsSettings extends Fragment { 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; } |