Credman - Remove divider from dropdown presentation (821043d5) · Commits · e / os / android_frameworks_base

packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_one_dark.xml→packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_middle.xml

+7 −13

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2023 The Android Open Source Project
		~ 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.
		@@ -15,16 +15,10 @@
		~ 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:radius="28dp" />
		<solid android:color="@android:color/system_surface_container_high_dark" />
		<inset xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi">
		<shape android:shape="rectangle">
		<solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
		</shape>
		</item>
		</ripple>
		No newline at end of file
		</inset>
		No newline at end of file

packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_one.xml

+8 −12

Original line number	Diff line number	Diff line
		@@ -15,16 +15,12 @@
		~ 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:radius="4dp" />
		<solid android:color="@color/dropdown_container" />
		<inset xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi">
		<shape android:shape="rectangle">
		<corners android:topLeftRadius="4dp" android:topRightRadius="4dp"
		android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp"/>
		<solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
		</shape>
		</item>
		</ripple>
		No newline at end of file
		</inset>
		No newline at end of file

packages/CredentialManager/res/drawable/more_options_list_item.xml

+13 −14

Original line number	Diff line number	Diff line
		@@ -15,17 +15,16 @@
		~ limitations under the License.
		-->

		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		<inset xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/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">
		android:insetLeft="-2dp"
		android:insetRight="-2dp"
		android:insetBottom="-2dp">
		<shape>
		<corners android:bottomLeftRadius="4dp"
		android:bottomRightRadius="4dp"/>
		<solid android:color="@color/sign_in_options_container" />
		<corners android:topLeftRadius="0dp" android:topRightRadius="0dp"
		android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp"/>
		<solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
		<stroke android:color="?androidprv:attr/materialColorOutlineVariant" android:width="1dp"/>
		</shape>
		</item>
		</ripple>
		No newline at end of file
		</inset>
		No newline at end of file

packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml

+37 −15

Original line number	Diff line number	Diff line
		@@ -14,30 +14,52 @@
		~ limitations under the License.
		-->
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:id="@android:id/content"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minHeight="@dimen/dropdown_touch_target_min_height"
		android:orientation="horizontal"
		android:layout_marginEnd="@dimen/dropdown_layout_horizontal_margin"
		android:elevation="3dp">

		<LinearLayout
		android:id="@+id/credential_card"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal">

		<ImageView
		android:id="@android:id/icon1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerVertical="true"
		android:layout_gravity="center"
		android:paddingLeft="@dimen/autofill_view_left_padding"
		android:src="@drawable/more_horiz_24px"
		android:tint="?androidprv:attr/materialColorOnSurface"
		android:layout_alignParentStart="true"
		android:contentDescription="@string/more_options_content_description"
		android:background="@null"/>

		<LinearLayout
		android:id="@+id/text_container"
		android:layout_width="@dimen/autofill_dropdown_textview_max_width"
		android:layout_height="wrap_content"
		android:paddingLeft="@dimen/autofill_view_left_padding"
		android:paddingRight="@dimen/autofill_view_right_padding"
		android:paddingTop="@dimen/more_options_item_vertical_padding"
		android:paddingBottom="@dimen/more_options_item_vertical_padding"
		android:orientation="vertical">

		<TextView
		android:id="@android:id/text1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:textColor="?androidprv:attr/materialColorOnSurface"
		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"/>
		</LinearLayout>

		</LinearLayout>

		</RelativeLayout>

packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml

+47 −24

Original line number	Diff line number	Diff line
		@@ -14,37 +14,60 @@
		~ limitations under the License.
		-->
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:id="@android:id/content"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minHeight="@dimen/dropdown_touch_target_min_height"
		android:layout_marginEnd="@dimen/dropdown_layout_horizontal_margin"
		android:elevation="3dp">

		<LinearLayout
		android:id="@+id/credential_card"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal">

		<ImageView
		android:id="@android:id/icon1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerVertical="true"
		android:layout_gravity="center"
		android:layout_alignParentStart="true"
		android:paddingLeft="@dimen/autofill_view_left_padding"
		app:tint="?androidprv:attr/materialColorOnSurface"
		android:background="@null"/>

		<LinearLayout
		android:id="@+id/text_container"
		android:layout_width="@dimen/autofill_dropdown_textview_max_width"
		android:layout_height="wrap_content"
		android:paddingLeft="@dimen/autofill_view_left_padding"
		android:paddingRight="@dimen/autofill_view_right_padding"
		android:paddingTop="@dimen/autofill_view_top_padding"
		android:paddingBottom="@dimen/autofill_view_bottom_padding"
		android:orientation="vertical">

		<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"
		android:textColor="?androidprv:attr/materialColorOnSurface"
		style="@style/autofill.TextTitle"/>

		<TextView
		android:id="@android:id/text2"
		android:layout_width="wrap_content"
		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"
		android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
		style="@style/autofill.TextSubtitle"/>

		</LinearLayout>

		</LinearLayout>

		</RelativeLayout>