Merge "Credman UX - Differentiate dropdown/inline presentation for passkey and password" into main (debe37a7) · Commits · e / os / android_frameworks_base

packages/CredentialManager/res/drawable/autofill_light_selectable_item_background.xml

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>

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

		<!-- Copied from //frameworks/base/core/res/res/drawable/item_background_material.xml -->
		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="@color/autofill_light_colorControlHighlight">
		<item android:id="@android:id/mask">
		<color android:color="@android:color/white"/>
		</item>
		</ripple>
		No newline at end of file

+3 −3

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.
		@@ -23,8 +23,8 @@
		android:shape="rectangle"
		android:top="1dp">
		<shape>
		<corners android:radius="28dp" />
		<solid android:color="@android:color/system_surface_container_high_light" />
		<corners android:radius="16dp" />
		<solid android:color="@color/dropdown_container" />
		</shape>
		</item>
		</ripple>
		No newline at end of file

+45 −0

Original line number	Diff line number	Diff line
		@@ -13,12 +13,13 @@
		~ 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="match_parent"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/autofill.Dataset">
		android:maxWidth="@dimen/autofill_dropdown_layout_width"
		android:elevation="3dp">

		<ImageView
		android:id="@android:id/icon1"
		android:layout_width="wrap_content"
		@@ -28,10 +29,17 @@
		android:background="@null"/>
		<TextView
		android:id="@android:id/text1"
		android:layout_width="wrap_content"
		android:layout_width="@dimen/autofill_dropdown_text_width"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:layout_toEndOf="@android:id/icon1"
		style="@style/autofill.TextAppearance"/>
		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"
		style="@style/autofill.TextSubtitle"/>

		</RelativeLayout>

+3 −18

Original line number	Diff line number	Diff line
		@@ -16,23 +16,8 @@

		<!-- Color palette -->
		<resources>
		<color name="autofill_light_colorPrimary">@color/primary_material_light</color>
		<color name="autofill_light_colorAccent">@color/accent_material_light</color>
		<color name="autofill_light_colorControlHighlight">@color/ripple_material_light</color>
		<color name="autofill_light_colorButtonNormal">@color/button_material_light</color>

		<!-- Text colors -->
		<color name="autofill_light_textColorPrimary">@color/abc_primary_text_material_light</color>
		<color name="autofill_light_textColorSecondary">@color/abc_secondary_text_material_light</color>
		<color name="autofill_light_textColorHint">@color/abc_hint_foreground_material_light</color>
		<color name="autofill_light_textColorHintInverse">@color/abc_hint_foreground_material_dark
		</color>
		<color name="autofill_light_textColorHighlight">@color/highlighted_text_material_light</color>
		<color name="autofill_light_textColorLink">@color/autofill_light_colorAccent</color>

		<!-- These colors are used for Remote Views. -->
		<color name="background_dark_mode">#0E0C0B</color>
		<color name="background">#F1F3F4</color>
		<color name="text_primary_dark_mode">#DFDEDB</color>
		<color name="text_primary">#202124</color>
		<color name="text_primary">#1A1B20</color>
		<color name="text_secondary">#44474F</color>
		<color name="dropdown_container">#F3F3FA</color>
		</resources>
		No newline at end of file

+8 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,12 @@
		-->

		<resources>
		<dimen name="autofill_view_padding">16dp</dimen>
		<dimen name="autofill_icon_size">16dp</dimen>
		<dimen name="autofill_view_top_padding">12dp</dimen>
		<dimen name="autofill_view_right_padding">24dp</dimen>
		<dimen name="autofill_view_bottom_padding">12dp</dimen>
		<dimen name="autofill_view_left_padding">16dp</dimen>
		<dimen name="autofill_view_icon_to_text_padding">10dp</dimen>
		<dimen name="autofill_icon_size">24dp</dimen>
		<dimen name="autofill_dropdown_layout_width">296dp</dimen>
		<dimen name="autofill_dropdown_text_width">240dp</dimen>
		</resources>
		No newline at end of file