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/java/it/niedermann/nextcloud/deck/ui/EditActivity.java | |
| 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/java/it/niedermann/nextcloud/deck/ui/EditActivity.java')
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java index 97154674d..3ca3be3d4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java @@ -3,9 +3,9 @@ package it.niedermann.nextcloud.deck.ui; import android.arch.lifecycle.ViewModelProviders; import android.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.tabs.TabLayout; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.widget.EditText; import android.widget.TextView; |