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

Commit 713d3253 authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Remove credential management app Settings" into sc-dev

parents 74e14085 8d06d63f

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1486,6 +1486,7 @@ 
        </activity>



        <activity android:name=".security.RequestManageCredentials"

                  android:theme="@style/Theme.SubSettings"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.security.MANAGE_CREDENTIALS"/>

res/drawable/ic_redo_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 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.

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M6,13.5C6,11.57 7.75,10 9.9,10h6.27l-2.59,2.59L15,14l5,-5 -5,-5 -1.41,1.41L16.17,8H9.9C6.65,8 4,10.47 4,13.5S6.65,19 9.9,19H17v-2H9.9C7.75,17 6,15.43 6,13.5z"/>

</vector>
 
 No newline at end of file

res/layout-land/request_manage_credentials.xml

+2 −1
Original line number Diff line number Diff line
@@ -123,11 +123,12 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/request_manage_credentials_more"

                    android:textColor="?android:attr/colorBackground"

                    android:theme="@style/Theme.CollapsingToolbar.Settings"

                    app:backgroundTint="?android:attr/colorAccent"

                    app:elevation="3dp"

                    app:icon="@drawable/ic_arrow_downward"

                    app:iconTint="?android:attr/textColorPrimary"

                    app:iconTint="?android:attr/colorBackground"

                    app:layout_anchor="@id/apps_list"

                    app:layout_anchorGravity="bottom|center" />

res/layout-sw600dp/request_manage_credentials.xml

+2 −1
Original line number Diff line number Diff line
@@ -97,11 +97,12 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:text="@string/request_manage_credentials_more"

                        android:textColor="?android:attr/colorBackground"

                        android:theme="@style/Theme.CollapsingToolbar.Settings"

                        app:backgroundTint="?android:attr/colorAccent"

                        app:elevation="3dp"

                        app:icon="@drawable/ic_arrow_downward"

                        app:iconTint="?android:attr/textColorPrimary"

                        app:iconTint="?android:attr/colorBackground"

                        app:layout_anchor="@id/apps_list"

                        app:layout_anchorGravity="bottom|center" />

res/layout/request_manage_credentials.xml

+2 −1
Original line number Diff line number Diff line
@@ -67,11 +67,12 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/request_manage_credentials_more"

        android:textColor="?android:attr/colorBackground"

        app:layout_anchor="@id/apps_list"

        app:layout_anchorGravity="bottom|center"

        app:elevation="3dp"

        app:icon="@drawable/ic_arrow_downward"

        app:iconTint="?android:attr/textColorPrimary"

        app:iconTint="?android:attr/colorBackground"

        app:backgroundTint="?android:attr/colorAccent"

        android:theme="@style/Theme.CollapsingToolbar.Settings"/>