diff options
| author | cyberta <cyberta@riseup.net> | 2020-03-17 08:15:56 -0700 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2020-03-17 08:15:56 -0700 |
| commit | e0fb2a88c633908bba9e465e1bf1e19a4a5686e6 (patch) | |
| tree | 781613cce835be44ea86178f8af6cb60a84a703e /app/src/main/res/layout/f_drawer_main.xml | |
| parent | 05205190ee65a5fa14f18d12f86f5427368bea44 (diff) | |
| parent | cea55aaaab23a74dc790afca12671303fc344f97 (diff) | |
Merge branch 'androidx' into 'master'
Androidx
See merge request leap/bitmask_android!103
Diffstat (limited to 'app/src/main/res/layout/f_drawer_main.xml')
| -rw-r--r-- | app/src/main/res/layout/f_drawer_main.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml index 7e6291b7..5a0977da 100644 --- a/app/src/main/res/layout/f_drawer_main.xml +++ b/app/src/main/res/layout/f_drawer_main.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="150dp"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" @@ -29,7 +29,7 @@ android:scaleType="fitXY" app:srcCompat="@drawable/background_drawer" /> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/foreground" android:layout_width="match_parent" android:layout_height="match_parent" |