From 74fe36c46ee50f5d34d09b67c4e35c38f32184fb Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 20 Mar 2018 15:30:46 +0000
Subject: [PATCH] Use selectable item background to get touch effect.
---
.../briar/android/keyagreement/ShowQrCodeFragment.java | 4 ++--
.../src/main/res/layout-land/fragment_keyagreement_qr.xml | 3 ++-
.../src/main/res/layout/fragment_keyagreement_qr.xml | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
index 459109c1b4..29a2715199 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
@@ -146,13 +146,13 @@ public class ShowQrCodeFragment extends BaseEventFragment
statusParams = new LayoutParams(MATCH_PARENT, 0, 1f);
qrCodeParams = new LayoutParams(MATCH_PARENT, 0, 1f);
}
- fullscreenButton.setBackgroundResource(
+ fullscreenButton.setImageResource(
R.drawable.ic_fullscreen_black_48dp);
} else {
// Grow the QR code container to fill its parent
statusParams = new LayoutParams(0, 0, 0f);
qrCodeParams = new LayoutParams(MATCH_PARENT, MATCH_PARENT, 1f);
- fullscreenButton.setBackgroundResource(
+ fullscreenButton.setImageResource(
R.drawable.ic_fullscreen_exit_black_48dp);
}
statusView.setLayoutParams(statusParams);
diff --git a/briar-android/src/main/res/layout-land/fragment_keyagreement_qr.xml b/briar-android/src/main/res/layout-land/fragment_keyagreement_qr.xml
index ba6b4421ea..9d378e5ba3 100644
--- a/briar-android/src/main/res/layout-land/fragment_keyagreement_qr.xml
+++ b/briar-android/src/main/res/layout-land/fragment_keyagreement_qr.xml
@@ -69,7 +69,8 @@
<ImageView
android:id="@+id/fullscreen_button"
- android:background="@drawable/ic_fullscreen_black_48dp"
+ android:background="?selectableItemBackground"
+ android:src="@drawable/ic_fullscreen_black_48dp"
android:alpha="0.54"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml b/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
index dedb8dde93..be534ca224 100644
--- a/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
+++ b/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
@@ -69,7 +69,8 @@
<ImageView
android:id="@+id/fullscreen_button"
- android:background="@drawable/ic_fullscreen_black_48dp"
+ android:background="?selectableItemBackground"
+ android:src="@drawable/ic_fullscreen_black_48dp"
android:alpha="0.54"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
--
GitLab