Skip to content

Commit 7f546f0

Browse files
samtsternsamtstern
authored
Make shadows have buttons on pre-L devices. (#843)
1 parent 3a082fd commit 7f546f0

13 files changed

+131
-25
lines changed

‎auth/src/main/res/drawable-v21/fui_idp_button_background_email.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item>
4+
<shape android:shape="rectangle">
5+
<corners android:radius="3dp" />
6+
<solid android:color="@color/fui_bgEmail" />
7+
</shape>
8+
</item>
9+
</layer-list>

‎auth/src/main/res/drawable-v21/fui_idp_button_background_facebook.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item>
4+
<shape android:shape="rectangle">
5+
<corners android:radius="3dp" />
6+
<solid android:color="@color/fui_bgFacebook" />
7+
</shape>
8+
</item>
9+
</layer-list>

‎auth/src/main/res/drawable-v21/fui_idp_button_background_google.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item>
4+
<shape android:shape="rectangle">
5+
<corners android:radius="3dp" />
6+
<solid android:color="@color/fui_bgGoogle" />
7+
</shape>
8+
</item>
9+
</layer-list>

‎auth/src/main/res/drawable-v21/fui_idp_button_background_phone.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item>
4+
<shape android:shape="rectangle">
5+
<corners android:radius="3dp" />
6+
<solid android:color="@color/fui_bgPhone" />
7+
</shape>
8+
</item>
9+
</layer-list>

‎auth/src/main/res/drawable-v21/fui_idp_button_background_twitter.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item>
4+
<shape android:shape="rectangle">
5+
<corners android:radius="3dp" />
6+
<solid android:color="@color/fui_bgTwitter" />
7+
</shape>
8+
</item>
9+
</layer-list>

‎auth/src/main/res/drawable/fui_idp_button_background_email.xml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android">
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
33
<item>
44
<shape android:shape="rectangle">
55
<corners android:radius="3dp" />
6-
<solid android:color="#D0021B" />
6+
<solid android:color="@color/fui_buttonShadow" />
77
</shape>
88
</item>
9-
</selector>
9+
<item
10+
android:bottom="@dimen/fui_button_inset_bottom"
11+
android:left="@dimen/fui_button_inset_left"
12+
android:right="@dimen/fui_button_inset_right"
13+
android:top="@dimen/fui_button_inset_top">
14+
<shape android:shape="rectangle">
15+
<corners android:radius="3dp" />
16+
<solid android:color="@color/fui_bgEmail" />
17+
</shape>
18+
</item>
19+
</layer-list>

‎auth/src/main/res/drawable/fui_idp_button_background_facebook.xml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android">
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
33
<item>
44
<shape android:shape="rectangle">
55
<corners android:radius="3dp" />
6-
<solid android:color="#3B5998" />
6+
<solid android:color="@color/fui_buttonShadow" />
77
</shape>
88
</item>
9-
</selector>
9+
<item
10+
android:bottom="@dimen/fui_button_inset_bottom"
11+
android:left="@dimen/fui_button_inset_left"
12+
android:right="@dimen/fui_button_inset_right"
13+
android:top="@dimen/fui_button_inset_top">
14+
<shape android:shape="rectangle">
15+
<corners android:radius="3dp" />
16+
<solid android:color="@color/fui_bgFacebook" />
17+
</shape>
18+
</item>
19+
</layer-list>

‎auth/src/main/res/drawable/fui_idp_button_background_google.xml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android">
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
33
<item>
44
<shape android:shape="rectangle">
55
<corners android:radius="3dp" />
6-
<solid android:color="#ffffff" />
6+
<solid android:color="@color/fui_buttonShadow" />
77
</shape>
88
</item>
9-
</selector>
9+
<item
10+
android:bottom="@dimen/fui_button_inset_bottom"
11+
android:left="@dimen/fui_button_inset_left"
12+
android:right="@dimen/fui_button_inset_right"
13+
android:top="@dimen/fui_button_inset_top">
14+
<shape android:shape="rectangle">
15+
<corners android:radius="3dp" />
16+
<solid android:color="@color/fui_bgGoogle" />
17+
</shape>
18+
</item>
19+
</layer-list>

‎auth/src/main/res/drawable/fui_idp_button_background_phone.xml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android">
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
33
<item>
44
<shape android:shape="rectangle">
55
<corners android:radius="3dp" />
6-
<solid android:color="#43C5A5" />
6+
<solid android:color="@color/fui_buttonShadow" />
77
</shape>
88
</item>
9-
</selector>
9+
<item
10+
android:bottom="@dimen/fui_button_inset_bottom"
11+
android:left="@dimen/fui_button_inset_left"
12+
android:right="@dimen/fui_button_inset_right"
13+
android:top="@dimen/fui_button_inset_top">
14+
<shape android:shape="rectangle">
15+
<corners android:radius="3dp" />
16+
<solid android:color="@color/fui_bgPhone" />
17+
</shape>
18+
</item>
19+
</layer-list>

‎auth/src/main/res/drawable/fui_idp_button_background_twitter.xml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android">
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
33
<item>
44
<shape android:shape="rectangle">
55
<corners android:radius="3dp" />
6-
<solid android:color="#FF5BAAF4" />
6+
<solid android:color="@color/fui_buttonShadow" />
77
</shape>
88
</item>
9-
</selector>
9+
<item
10+
android:bottom="@dimen/fui_button_inset_bottom"
11+
android:left="@dimen/fui_button_inset_left"
12+
android:right="@dimen/fui_button_inset_right"
13+
android:top="@dimen/fui_button_inset_top">
14+
<shape android:shape="rectangle">
15+
<corners android:radius="3dp" />
16+
<solid android:color="@color/fui_bgTwitter" />
17+
</shape>
18+
</item>
19+
</layer-list>

0 commit comments

Comments
 (0)