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

Commit b5e37f1d authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Show installed user keys in Security Settings"

parents 68a28751 baefdcf9

res/layout/user_credential.xml

0 → 100644
+64 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:gravity="center_vertical"

    android:background="?android:attr/selectableItemBackground"

    android:paddingTop="15dip"

    android:paddingBottom="15dip">



    <TextView

        android:id="@+id/alias"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:textAppearance="?android:attr/textAppearanceMedium" />



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1">



        <TextView

            android:id="@+id/contents_userkey"

            android:text="@string/one_userkey"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textColor="?android:attr/textColorSecondary" />



        <TextView

            android:id="@+id/contents_usercrt"

            android:text="@string/one_usercrt"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textColor="?android:attr/textColorSecondary" />



        <TextView

            android:id="@+id/contents_cacrt"

            android:text="@string/one_cacrt"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textColor="?android:attr/textColorSecondary" />



    </LinearLayout>

</LinearLayout>

res/layout/user_credential_dialog.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:paddingStart="24dp"

    android:paddingTop="16dp"

    android:paddingEnd="24dp" >



    <FrameLayout

        android:id="@+id/credential_container"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content" />



</LinearLayout>

res/layout/user_credentials.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingStart="@dimen/settings_side_margin"

    android:paddingEnd="@dimen/settings_side_margin">



    <ListView

        android:id="@+id/credential_list"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:scrollbarStyle="outsideOverlay">

    </ListView>



</LinearLayout>

res/values/strings.xml

+15 −0
Original line number Diff line number Diff line
@@ -4583,6 +4583,10 @@ 
    <string name="trusted_credentials">Trusted credentials</string>

    <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->

    <string name="trusted_credentials_summary">Display trusted CA certificates</string>

    <!-- Title of preference to display user credentials and keys [CHAR LIMIT=30] -->

    <string name="user_credentials">User credentials</string>

    <!-- Summary of preference to display user credentials and keys [CHAR LIMIT=NONE] -->

    <string name="user_credentials_summary">View and modify stored credentials</string>

    <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->

    <string name="advanced_security_title">Advanced</string>

    <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
@@ -5428,6 +5432,17 @@ 
    <!-- Alert dialog confirmation when removing a user CA certificate. -->

    <string name="trusted_credentials_remove_confirmation">Permanently remove the user CA certificate?</string>









    <!-- Item found in the PKCS12 keystore being investigated [CHAR LIMIT=NONE] -->









    <string name="one_userkey">one user key</string>









    <!-- Item found in the PKCS12 keystore being investigated [CHAR LIMIT=NONE] -->









    <string name="one_usercrt">one user certificate</string>









    <!-- Item found in the PKCS12 keystore being investigated [CHAR LIMIT=NONE] -->









    <string name="one_cacrt">one CA certificate</string>









    <!-- Item found in thee PKCS12 keystore being investigated [CHAR LIMIT=NONE]-->









    <string name="n_cacrts">%d CA certificates</string>









    <!-- Alert dialog when viewing a set of user credentials. -->









    <string name="user_credential_title">Credential Details</string>

















    <!--  Title for spell checker settings -->









    <string name="spellcheckers_settings_title">Spell checker</string>








































res/xml/security_settings_misc.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -75,6 +75,12 @@







                android:persistent="false"









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



















        <Preference android:key="user_credentials"









                android:title="@string/user_credentials"









                android:summary="@string/user_credentials_summary"









                android:persistent="false"









                android:fragment="com.android.settings.UserCredentialsSettings"/>



















        <Preference android:key="credentials_install"









                android:title="@string/credentials_install"









                android:summary="@string/credentials_install_summary"