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

Allow navigation to TrustedCredentials User Certs by intent.

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

Change-Id: Ic3cfa1f3bdc3f2eefc290195679011c224496d63
This commit is contained in:
Geoffrey Borggaard
2013-08-09 11:44:42 -04:00
parent f3796d0bf8
commit fc6bc20161
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/Settings.java
View File

@@ -334,6 +334,7 @@ public class Settings extends PreferenceActivity
NotificationAccessSettings.class.getName(),
ManageAccountsSettings.class.getName(),
PrintingSettings.class.getName(),
TrustedCredentialsSettings.class.getName()
};
@Override
@@ -958,4 +959,5 @@ public class Settings extends PreferenceActivity
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 */ }
}

6
src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -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;
}