aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrohands <rohan0495@gmail.com>2015-09-20 20:20:43 +0530
committerrohands <rohan0495@gmail.com>2015-09-20 20:20:43 +0530
commitafbf2b36cf07e3225e186f1ce555927e5240f100 (patch)
treeb7290fce9a0df09e51408d8e15abb8183e4f8906
parent50f404ccddd30becf1d69129f493a2620110ed4d (diff)
downloadopen-keychain-afbf2b36cf07e3225e186f1ce555927e5240f100.tar.gz
open-keychain-afbf2b36cf07e3225e186f1ce555927e5240f100.tar.bz2
open-keychain-afbf2b36cf07e3225e186f1ce555927e5240f100.zip
Updated
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java8
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java16
-rw-r--r--OpenKeychain/src/main/res/layout/key_list_item.xml3
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_activity.xml4
5 files changed, 27 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 4e1f41ba0..09d2b9fcf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -708,7 +708,7 @@ public class KeyListFragment extends LoaderFragment
holder.mSlinger.setVisibility(View.VISIBLE);
- LongClick.setup(holder.mSlingerButton,getString(R.string.exchange_keys));
+ LongClick.setup(holder.mSlingerButton);
holder.mSlingerButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index f9bde850e..6e30f7a22 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -184,10 +184,10 @@ public class ViewKeyActivity extends BaseNfcActivity implements
//Long Click Listeners implemented
- LongClick.setup(mActionEncryptFile,getString(R.string.encrypt_files));
- LongClick.setup(mActionEncryptText,getString(R.string.encrypt_text));
- LongClick.setup(mActionNfc,getString(R.string.share_nfc));
- LongClick.setup(mFab,getString(R.string.exchange_keys));
+ LongClick.setup(mActionEncryptFile);
+ LongClick.setup(mActionEncryptText);
+ LongClick.setup(mActionNfc);
+ LongClick.setup(mFab);
mRotateSpin.setAnimationListener(new AnimationListener() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java
index c41f77767..5b0bcbb78 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java
@@ -3,6 +3,22 @@ package org.sufficientlysecure.keychain.ui.util;
/**
* Created by rohan on 20/9/15.
*/
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import android.content.Context;
import android.graphics.Rect;
import android.text.TextUtils;
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 80be0ec34..88c19c1a6 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -123,7 +123,8 @@
android:layout_gravity="center"
android:src="@drawable/ic_repeat_grey_24dp"
android:padding="12dp"
- android:background="?android:selectableItemBackground" />
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/exchange_keys"/>
</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 560180407..a6f9fd17f 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -94,6 +94,7 @@
<ImageButton
android:id="@+id/view_key_action_encrypt_files"
+ android:contentDescription="@string/encrypt_files"
style="?android:attr/borderlessButtonStyle"
android:layout_width="64dp"
android:layout_height="64dp"
@@ -103,6 +104,7 @@
<ImageButton
android:id="@+id/view_key_action_encrypt_text"
+ android:contentDescription="@string/encrypt_text"
style="?android:attr/borderlessButtonStyle"
android:layout_width="64dp"
android:layout_height="64dp"
@@ -113,6 +115,7 @@
<ImageButton
android:id="@+id/view_key_action_nfc"
style="?android:attr/borderlessButtonStyle"
+ android:contentDescription="@string/share_nfc"
android:layout_width="64dp"
android:layout_height="64dp"
android:src="@drawable/ic_nfc_white_24dp"
@@ -213,6 +216,7 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
+ android:contentDescription="@string/exchange_keys"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"