Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 863b8839 authored by Geoffrey Borggaard's avatar Geoffrey Borggaard Committed by Android Git Automerger
Browse files

am fc6bc201: Allow navigation to TrustedCredentials User Certs by intent. 

* commit 'fc6bc201':
  Allow navigation to TrustedCredentials User Certs by intent.
parents b690af54 fc6bc201

AndroidManifest.xml

+17 −0
Original line number Diff line number Diff line
@@ -854,6 +854,23 @@ 
                android:resource="@id/security_settings" />

        </activity>



        <activity android:name="Settings$TrustedCredentialsSettingsActivity"

                android:label="@string/trusted_credentials"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />

                <action android:name="com.android.settings.TRUSTED_CREDENTIALS_USER" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.TrustedCredentialsSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/security_settings" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="SecuritySettings"

                android:label="@string/security_settings_title"

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -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 */ }

}

src/com/android/settings/TrustedCredentialsSettings.java

+6 −0
Original line number Diff line number Diff line
@@ -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;

    }