-
-
Notifications
You must be signed in to change notification settings - Fork 6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Fix invite drawable on API 21."
This reverts commit 78fbfe40736dd8c9ccafb402aa7fc6921c1d4496. We have turned on AppCompatDelegate.setCompatVectorFromResourcesEnabled(true) now for API19.
- Loading branch information
1 parent
42967da
commit ef585eb
Showing
3 changed files
with
26 additions
and
37 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<item> | ||
<shape android:shape="oval"> | ||
<solid android:color="#70707C" /> | ||
</shape> | ||
</item> | ||
<item | ||
android:bottom="10dp" | ||
android:drawable="@drawable/ic_invite_28dp" | ||
android:left="10dp" | ||
android:right="10dp" | ||
android:top="10dp" /> | ||
</layer-list> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,17 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||
<TextView xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:tools="http://schemas.android.com/tools" | ||
style="@style/Signal.Text.Body" | ||
android:layout_width="match_parent" | ||
android:layout_height="@dimen/contact_selection_item_height" | ||
android:drawableStart="@drawable/ic_invite_circle" | ||
android:drawablePadding="16dp" | ||
android:ellipsize="marquee" | ||
android:fontFamily="sans-serif-medium" | ||
android:gravity="center_vertical|start" | ||
android:labelFor="@id/action_icon" | ||
android:paddingStart="@dimen/selection_item_header_width" | ||
tools:ignore="RtlSymmetry,UseCompoundDrawables"> | ||
|
||
<FrameLayout | ||
android:layout_width="@dimen/selection_item_header_width" | ||
android:layout_height="@dimen/selection_item_header_width" | ||
android:layout_gravity="center_vertical" | ||
android:background="@drawable/circle_invite"> | ||
|
||
<ImageView | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:padding="10dp" | ||
app:srcCompat="@drawable/ic_invite_28dp" | ||
tools:ignore="ContentDescription" /> | ||
</FrameLayout> | ||
|
||
<TextView | ||
style="@style/Signal.Text.Body" | ||
android:layout_width="match_parent" | ||
android:layout_height="@dimen/contact_selection_item_height" | ||
android:layout_marginStart="16dp" | ||
android:ellipsize="marquee" | ||
android:fontFamily="sans-serif-medium" | ||
android:gravity="center_vertical|start" | ||
android:labelFor="@id/action_icon" | ||
android:singleLine="true" | ||
android:text="@string/contact_selection_activity__invite_to_signal" | ||
android:textAlignment="viewStart" /> | ||
|
||
</LinearLayout> | ||
android:singleLine="true" | ||
android:text="@string/contact_selection_activity__invite_to_signal" | ||
android:textAlignment="viewStart" | ||
tools:ignore="RtlSymmetry" /> |