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

Commit 1610b74e authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "[User Switcher] Make add button pillshaped." into tm-qpr-dev

parents 9935dae6 402ee0a6
Loading
Loading
Loading
Loading
+42 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2022 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.
  -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
    android:insetTop="@dimen/dialog_button_vertical_inset"
    android:insetBottom="@dimen/dialog_button_vertical_inset">
    <ripple android:color="?android:attr/colorControlHighlight">
        <item android:id="@android:id/mask">
            <shape android:shape="rectangle">
                <solid android:color="@android:color/white"/>
                <corners android:radius="20dp"/>
            </shape>
        </item>
        <item>
            <shape android:shape="rectangle">
                <corners android:radius="20dp"/>
                <solid android:color="@android:color/transparent"/>
                <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"
                    android:width="1dp"
                    />
                <padding android:left="@dimen/dialog_button_horizontal_padding"
                    android:top="@dimen/dialog_button_vertical_padding"
                    android:right="@dimen/dialog_button_horizontal_padding"
                    android:bottom="@dimen/dialog_button_vertical_padding"/>
            </shape>
        </item>
    </ripple>
</inset>
+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@

    <TextView
        android:id="@+id/add"
        style="@style/Widget.Dialog.Button.BorderButton"
        android:background="@drawable/user_switcher_fullscreen_button_bg"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"