diff options
| author | stefan-niedermann <info@niedermann.it> | 2019-03-11 20:34:12 +0300 |
|---|---|---|
| committer | stefan-niedermann <info@niedermann.it> | 2019-03-11 20:34:12 +0300 |
| commit | caf59197c718541b3d62b3182bbef027051972b1 (patch) | |
| tree | 52228aa11eadf492a3bcea7cd6604b88639bad09 /app/src/main/res/layout/fragment_card_edit_tab_details.xml | |
| parent | 373211e40462e58fffc84035ef24d3171f116846 (diff) | |
| parent | 785143550b3486007d46da88f9a8477aee8589a9 (diff) | |
Merge remote-tracking branch 'origin/edit' into edit
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java
# app/src/main/res/layout/activity_edit.xml
# app/src/main/res/layout/fragment_card_edit_tab_details.xml
Diffstat (limited to 'app/src/main/res/layout/fragment_card_edit_tab_details.xml')
| -rw-r--r-- | app/src/main/res/layout/fragment_card_edit_tab_details.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/res/layout/fragment_card_edit_tab_details.xml b/app/src/main/res/layout/fragment_card_edit_tab_details.xml index 9b4cff5d0..4dd57bcee 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_details.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_details.xml @@ -71,7 +71,7 @@ android:hint="@string/label_labels" /> </LinearLayout> - <android.support.design.chip.ChipGroup + <com.google.android.material.chip.ChipGroup android:id="@+id/labelsGroup" android:layout_width="match_parent" android:layout_height="wrap_content" |