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

Commit 7e65621d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12841962 from 86e03200 to 25Q2-release 

Change-Id: Idacad9080ea4e15a0bb2b05a3998126c5244a7cd
parents 9d614e23 86e03200

packages/CredentialManager/src/com/android/credentialmanager/common/ui/ActionButton.kt

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ fun ToggleVisibilityButton(modifier: Modifier = Modifier, onToggle: (Boolean) -> 
            imageVector = if (toggleState.value)

                Icons.Outlined.Visibility else Icons.Outlined.VisibilityOff,

            contentDescription = if (toggleState.value)

                stringResource(R.string.content_description_show_password) else

                stringResource(R.string.content_description_hide_password),

                stringResource(R.string.content_description_hide_password) else

                stringResource(R.string.content_description_show_password),

            tint = MaterialTheme.colorScheme.onSurfaceVariant,

        )

    }

packages/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outline_color_selector.xml

0 → 100644
+21 −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.

  -->



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

    <item android:state_checked="true" android:color="@android:color/transparent"/>

    <item android:color="?attr/colorOutlineVariant"/>

</selector>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outlined_background_color_selector.xml

0 → 100644
+25 −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.

  -->



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

    <item android:state_enabled="false" android:state_checked="true"

        android:alpha="0.12"

        android:color="?attr/colorOnSurface"/>

    <item android:state_checked="true" android:color="?attr/colorContainerChecked"/>

    <item android:state_checkable="true" android:color="?attr/colorContainerUnchecked"/>

    <item android:color="?attr/colorContainer" />

</selector>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/color/settingslib_expressive_filled_button_color.xml

0 → 100644
+24 −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.

  -->



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

    <item android:state_enabled="false"

        android:alpha="0.12" android:color="@color/settingslib_materialColorOnSurface"/>

    <item android:state_checked="true" android:color="@color/settingslib_materialColorPrimary"/>

    <item android:state_checkable="true" android:color="@color/settingslib_materialColorSurfaceContainer"/>

    <item android:color="@color/settingslib_materialColorPrimary" />

</selector>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_collapsable_textview.xml

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
        android:id="@+id/collapse_button"

        app:layout_constraintTop_toBottomOf="@id/settingslib_expressive_learn_more"

        app:layout_constraintStart_toStartOf="parent"

        android:textColor="@color/settingslib_materialColorOnSurface"

        android:text="@string/settingslib_expressive_text_expand"

        app:icon="@drawable/settingslib_expressive_icon_expand"

        style="@style/SettingslibTextButtonStyle.Expressive"/>