summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-11-05 18:54:38 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-11-06 15:52:32 +0100
commitefeb299de710d60e8f4af80ba6ad4d0260c1e548 (patch)
tree9d4eee7e5a203e831f309505709f53ef4bf72e46
parent909b43fb702b6eb77a481bdfbd2584ca53abbab0 (diff)
remove redundant namespace declarations
and two other minor layout fixes
-rw-r--r--android/sdremote/mobile/src/main/res/layout/activity_computers.xml3
-rw-r--r--android/sdremote/mobile/src/main/res/layout/activity_settings.xml2
-rw-r--r--android/sdremote/mobile/src/main/res/layout/fragment_pointer.xml2
-rw-r--r--android/sdremote/mobile/src/main/res/layout/preference_item.xml2
4 files changed, 3 insertions, 6 deletions
diff --git a/android/sdremote/mobile/src/main/res/layout/activity_computers.xml b/android/sdremote/mobile/src/main/res/layout/activity_computers.xml
index 4d80912..e9aefc5 100644
--- a/android/sdremote/mobile/src/main/res/layout/activity_computers.xml
+++ b/android/sdremote/mobile/src/main/res/layout/activity_computers.xml
@@ -35,14 +35,12 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
- xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager_computers"
android:layout_width="match_parent"
android:layout_height="match_parent"
compat:layout_behavior="@string/appbar_scrolling_view_behavior"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
- xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/addFab"
android:title="@string/menu_add_computer"
android:layout_width="56dp"
@@ -53,7 +51,6 @@
android:visibility="visible"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
- xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/btFab"
android:layout_width="56dp"
android:layout_height="56dp"
diff --git a/android/sdremote/mobile/src/main/res/layout/activity_settings.xml b/android/sdremote/mobile/src/main/res/layout/activity_settings.xml
index 013d596..6885b25 100644
--- a/android/sdremote/mobile/src/main/res/layout/activity_settings.xml
+++ b/android/sdremote/mobile/src/main/res/layout/activity_settings.xml
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <fragment
+ <androidx.fragment.app.FragmentContainerView
android:id="@+id/settingsContent"
android:name="org.libreoffice.impressremote.activity.SettingsActivity$SettingsFragment"
android:tag="SettingsFragment"
diff --git a/android/sdremote/mobile/src/main/res/layout/fragment_pointer.xml b/android/sdremote/mobile/src/main/res/layout/fragment_pointer.xml
index c4abc26..0f421bd 100644
--- a/android/sdremote/mobile/src/main/res/layout/fragment_pointer.xml
+++ b/android/sdremote/mobile/src/main/res/layout/fragment_pointer.xml
@@ -23,7 +23,7 @@
android:orientation="vertical"
android:padding="@dimen/padding_slide">
- <org.libreoffice.impressremote.view.PointerViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+ <org.libreoffice.impressremote.view.PointerViewPager
android:id="@+id/pointer_pager_slides"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
diff --git a/android/sdremote/mobile/src/main/res/layout/preference_item.xml b/android/sdremote/mobile/src/main/res/layout/preference_item.xml
index 7166430..31e92e4 100644
--- a/android/sdremote/mobile/src/main/res/layout/preference_item.xml
+++ b/android/sdremote/mobile/src/main/res/layout/preference_item.xml
@@ -11,7 +11,7 @@
android:paddingBottom="@dimen/padding_vertical_list_item"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
- >
+ android:focusable="true">
<RelativeLayout
android:layout_width="0dp"