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

Commit 1ca908dc authored by Joy Babafemi's avatar Joy Babafemi Committed by Android (Google) Code Review
Browse files

Merge "Credman UI/UX - Add "Sign-In options" to dropdown presentation" into main

parents 9aef3944 053de9dd

packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_one.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        android:shape="rectangle"

        android:top="1dp">

        <shape>

            <corners android:radius="16dp" />

            <corners android:radius="4dp" />

            <solid android:color="@color/dropdown_container" />

        </shape>

    </item>

packages/CredentialManager/res/drawable/more_options_list_item.xml

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

<!--

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

  -->



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

        xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi"

        android:color="@android:color/transparent">

    <item

        android:bottom="1dp"

        android:shape="rectangle"

        android:top="1dp">

        <shape>

            <corners android:bottomLeftRadius="4dp"

                     android:bottomRightRadius="4dp"/>

            <solid android:color="@color/sign_in_options_container" />

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml

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

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

  -->

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

                android:id="@android:id/content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:layout_marginEnd="@dimen/dropdown_layout_horizontal_margin"

                android:elevation="3dp">



    <ImageView

        android:id="@android:id/icon1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_alignParentStart="true"

        android:contentDescription="@string/provider_icon_content_description"

        android:background="@null"/>

    <TextView

        android:id="@android:id/text1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_toEndOf="@android:id/icon1"

        android:minWidth="@dimen/autofill_dropdown_textview_min_width"

        android:maxWidth="@dimen/autofill_dropdown_textview_max_width"

        style="@style/autofill.TextTitle"/>



</RelativeLayout>

packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml

+7 −2
Original line number Diff line number Diff line
@@ -17,22 +17,25 @@ 
                android:id="@android:id/content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:maxWidth="@dimen/autofill_dropdown_layout_width"

                android:layout_marginEnd="@dimen/dropdown_layout_horizontal_margin"

                android:elevation="3dp">



        <ImageView

            android:id="@android:id/icon1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:contentDescription="@string/provider_icon_content_description"

            android:layout_centerVertical="true"

            android:layout_alignParentStart="true"

            android:background="@null"/>

        <TextView

            android:id="@android:id/text1"

            android:layout_width="@dimen/autofill_dropdown_text_width"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            android:layout_toEndOf="@android:id/icon1"

            android:minWidth="@dimen/autofill_dropdown_textview_min_width"

            android:maxWidth="@dimen/autofill_dropdown_textview_max_width"

            style="@style/autofill.TextTitle"/>

        <TextView

            android:id="@android:id/text2"
@@ -40,6 +43,8 @@ 
            android:layout_height="wrap_content"

            android:layout_below="@android:id/text1"

            android:layout_toEndOf="@android:id/icon1"

            android:minWidth="@dimen/autofill_dropdown_textview_min_width"

            android:maxWidth="@dimen/autofill_dropdown_textview_max_width"

            style="@style/autofill.TextSubtitle"/>



</RelativeLayout>

packages/CredentialManager/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ 
    <color name="text_primary">#1A1B20</color>

    <color name="text_secondary">#44474F</color>

    <color name="dropdown_container">#F3F3FA</color>

    <color name="sign_in_options_container">#DADADA</color>

    <color name="sign_in_options_icon_color">#1B1B1B</color>

</resources>
 
 No newline at end of file