From 50f404ccddd30becf1d69129f493a2620110ed4d Mon Sep 17 00:00:00 2001 From: rohands Date: Sun, 20 Sep 2015 18:57:18 +0530 Subject: Mousehints --- .../keychain/ui/KeyListFragment.java | 3 + .../keychain/ui/ViewKeyActivity.java | 10 +++ .../keychain/ui/util/LongClick.java | 85 ++++++++++++++++++++++ OpenKeychain/src/main/res/values/strings.xml | 4 + 4 files changed, 102 insertions(+) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java 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 ce6994ba4..4e1f41ba0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -67,6 +67,7 @@ import org.sufficientlysecure.keychain.ui.adapter.KeyAdapter; import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper; import org.sufficientlysecure.keychain.ui.util.FormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; +import org.sufficientlysecure.keychain.ui.util.LongClick; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.util.FabContainer; import org.sufficientlysecure.keychain.util.Log; @@ -706,6 +707,8 @@ public class KeyListFragment extends LoaderFragment final KeyItemViewHolder holder = (KeyItemViewHolder) view.getTag(); holder.mSlinger.setVisibility(View.VISIBLE); + + LongClick.setup(holder.mSlingerButton,getString(R.string.exchange_keys)); 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 930c1fc26..f9bde850e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -79,6 +79,7 @@ import org.sufficientlysecure.keychain.ui.linked.LinkedIdWizard; import org.sufficientlysecure.keychain.ui.util.FormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State; +import org.sufficientlysecure.keychain.ui.util.LongClick; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.Notify.ActionListener; import org.sufficientlysecure.keychain.ui.util.Notify.Style; @@ -180,6 +181,15 @@ public class ViewKeyActivity extends BaseNfcActivity implements mQrCodeLayout = (CardView) findViewById(R.id.view_key_qr_code_layout); mRotateSpin = AnimationUtils.loadAnimation(this, R.anim.rotate_spin); + + //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)); + + mRotateSpin.setAnimationListener(new AnimationListener() { @Override public void onAnimationStart(Animation animation) { 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 new file mode 100644 index 000000000..c41f77767 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java @@ -0,0 +1,85 @@ +package org.sufficientlysecure.keychain.ui.util; + +/** + * Created by rohan on 20/9/15. + */ +import android.content.Context; +import android.graphics.Rect; +import android.text.TextUtils; +import android.view.Gravity; +import android.view.View; +import android.widget.Toast; +public class LongClick { + private static final int ESTIMATED_TOAST_HEIGHT_DIPS = 48; + public static void setup(View view) { + view.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View view) { + return showLongClickText(view, view.getContentDescription()); + } + }); + } + + public static void setup(View view, final int textResId) { + view.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View view) { + return showLongClickText(view, view.getContext().getString(textResId)); + } + }); + } + + public static void setup(View view, final CharSequence text) { + view.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View view) { + return showLongClickText(view, text); + } + }); + } + + public static void remove(final View view) { + view.setOnLongClickListener(null); + } + + private static boolean showLongClickText(View view, CharSequence text) { + if (TextUtils.isEmpty(text)) { + return false; + } + + final int[] screenPos = new int[2]; // origin is device display + final Rect displayFrame = new Rect(); // includes decorations (e.g. status bar) + view.getLocationOnScreen(screenPos); + view.getWindowVisibleDisplayFrame(displayFrame); + + final Context context = view.getContext(); + final int viewWidth = view.getWidth(); + final int viewHeight = view.getHeight(); + final int viewCenterX = screenPos[0] + viewWidth / 2; + final int screenWidth = context.getResources().getDisplayMetrics().widthPixels; + final int estimatedToastHeight = (int) (ESTIMATED_TOAST_HEIGHT_DIPS + * context.getResources().getDisplayMetrics().density); + + Toast longClickText = Toast.makeText(context, text, Toast.LENGTH_SHORT); + boolean showBelow = screenPos[1] < estimatedToastHeight; + if (showBelow) { + // Show below + // Offsets are after decorations (e.g. status bar) are factored in + longClickText.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL, + viewCenterX - screenWidth / 2, + screenPos[1] - displayFrame.top + viewHeight); + } else { + // Show above + // Offsets are after decorations (e.g. status bar) are factored in + // NOTE: We can't use Gravity.BOTTOM because when the keyboard is up + // its height isn't factored in. + longClickText.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL, + viewCenterX - screenWidth / 2, + screenPos[1] - displayFrame.top - estimatedToastHeight); + } + + longClickText.show(); + return true; + } + +} diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 62083cbb4..1195e778e 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -99,6 +99,10 @@ "Add" "Save as default" "Saved!" + "Exchange Keys" + "Encrypt Files" + "Encrypt Text" + "Share Via NFC" "Settings" -- cgit v1.2.3 From afbf2b36cf07e3225e186f1ce555927e5240f100 Mon Sep 17 00:00:00 2001 From: rohands Date: Sun, 20 Sep 2015 20:20:43 +0530 Subject: Updated --- .../sufficientlysecure/keychain/ui/KeyListFragment.java | 2 +- .../sufficientlysecure/keychain/ui/ViewKeyActivity.java | 8 ++++---- .../sufficientlysecure/keychain/ui/util/LongClick.java | 16 ++++++++++++++++ OpenKeychain/src/main/res/layout/key_list_item.xml | 3 ++- OpenKeychain/src/main/res/layout/view_key_activity.xml | 4 ++++ 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"/> 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 @@ Date: Tue, 22 Sep 2015 23:06:26 +0530 Subject: Class names and string names are updated --- .../keychain/ui/KeyListFragment.java | 4 +- .../keychain/ui/ViewKeyActivity.java | 12 +-- .../keychain/ui/util/ContentDescriptionHint.java | 101 +++++++++++++++++++++ .../keychain/ui/util/LongClick.java | 101 --------------------- OpenKeychain/src/main/res/layout/key_list_item.xml | 2 +- .../src/main/res/layout/view_key_activity.xml | 8 +- OpenKeychain/src/main/res/values/strings.xml | 10 +- 7 files changed, 120 insertions(+), 118 deletions(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java 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 09d2b9fcf..2b6d786d4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -67,7 +67,7 @@ import org.sufficientlysecure.keychain.ui.adapter.KeyAdapter; import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper; import org.sufficientlysecure.keychain.ui.util.FormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; -import org.sufficientlysecure.keychain.ui.util.LongClick; +import org.sufficientlysecure.keychain.ui.util.ContentDescriptionHint; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.util.FabContainer; import org.sufficientlysecure.keychain.util.Log; @@ -708,7 +708,7 @@ public class KeyListFragment extends LoaderFragment holder.mSlinger.setVisibility(View.VISIBLE); - LongClick.setup(holder.mSlingerButton); + ContentDescriptionHint.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 6e30f7a22..a09e74abe 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -79,7 +79,7 @@ import org.sufficientlysecure.keychain.ui.linked.LinkedIdWizard; import org.sufficientlysecure.keychain.ui.util.FormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State; -import org.sufficientlysecure.keychain.ui.util.LongClick; +import org.sufficientlysecure.keychain.ui.util.ContentDescriptionHint; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.Notify.ActionListener; import org.sufficientlysecure.keychain.ui.util.Notify.Style; @@ -182,12 +182,12 @@ public class ViewKeyActivity extends BaseNfcActivity implements mRotateSpin = AnimationUtils.loadAnimation(this, R.anim.rotate_spin); - //Long Click Listeners implemented + //ContentDescriptionHint Listeners implemented - LongClick.setup(mActionEncryptFile); - LongClick.setup(mActionEncryptText); - LongClick.setup(mActionNfc); - LongClick.setup(mFab); + ContentDescriptionHint.setup(mActionEncryptFile); + ContentDescriptionHint.setup(mActionEncryptText); + ContentDescriptionHint.setup(mActionNfc); + ContentDescriptionHint.setup(mFab); mRotateSpin.setAnimationListener(new AnimationListener() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java new file mode 100644 index 000000000..8e45a20e9 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java @@ -0,0 +1,101 @@ +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; +import android.view.Gravity; +import android.view.View; +import android.widget.Toast; +public class ContentDescriptionHint { + private static final int ESTIMATED_TOAST_HEIGHT_DIPS = 48; + public static void setup(View view) { + view.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View view) { + return showLongClickText(view, view.getContentDescription()); + } + }); + } + + public static void setup(View view, final int textResId) { + view.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View view) { + return showLongClickText(view, view.getContext().getString(textResId)); + } + }); + } + + public static void setup(View view, final CharSequence text) { + view.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View view) { + return showLongClickText(view, text); + } + }); + } + + public static void remove(final View view) { + view.setOnLongClickListener(null); + } + + private static boolean showLongClickText(View view, CharSequence text) { + if (TextUtils.isEmpty(text)) { + return false; + } + + final int[] screenPos = new int[2]; // origin is device display + final Rect displayFrame = new Rect(); // includes decorations (e.g. status bar) + view.getLocationOnScreen(screenPos); + view.getWindowVisibleDisplayFrame(displayFrame); + + final Context context = view.getContext(); + final int viewWidth = view.getWidth(); + final int viewHeight = view.getHeight(); + final int viewCenterX = screenPos[0] + viewWidth / 2; + final int screenWidth = context.getResources().getDisplayMetrics().widthPixels; + final int estimatedToastHeight = (int) (ESTIMATED_TOAST_HEIGHT_DIPS + * context.getResources().getDisplayMetrics().density); + + Toast longClickText = Toast.makeText(context, text, Toast.LENGTH_SHORT); + boolean showBelow = screenPos[1] < estimatedToastHeight; + if (showBelow) { + // Show below + // Offsets are after decorations (e.g. status bar) are factored in + longClickText.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL, + viewCenterX - screenWidth / 2, + screenPos[1] - displayFrame.top + viewHeight); + } else { + // Show above + // Offsets are after decorations (e.g. status bar) are factored in + // NOTE: We can't use Gravity.BOTTOM because when the keyboard is up + // its height isn't factored in. + longClickText.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL, + viewCenterX - screenWidth / 2, + screenPos[1] - displayFrame.top - estimatedToastHeight); + } + + longClickText.show(); + return true; + } + +} 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 deleted file mode 100644 index 5b0bcbb78..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java +++ /dev/null @@ -1,101 +0,0 @@ -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; -import android.view.Gravity; -import android.view.View; -import android.widget.Toast; -public class LongClick { - private static final int ESTIMATED_TOAST_HEIGHT_DIPS = 48; - public static void setup(View view) { - view.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View view) { - return showLongClickText(view, view.getContentDescription()); - } - }); - } - - public static void setup(View view, final int textResId) { - view.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View view) { - return showLongClickText(view, view.getContext().getString(textResId)); - } - }); - } - - public static void setup(View view, final CharSequence text) { - view.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View view) { - return showLongClickText(view, text); - } - }); - } - - public static void remove(final View view) { - view.setOnLongClickListener(null); - } - - private static boolean showLongClickText(View view, CharSequence text) { - if (TextUtils.isEmpty(text)) { - return false; - } - - final int[] screenPos = new int[2]; // origin is device display - final Rect displayFrame = new Rect(); // includes decorations (e.g. status bar) - view.getLocationOnScreen(screenPos); - view.getWindowVisibleDisplayFrame(displayFrame); - - final Context context = view.getContext(); - final int viewWidth = view.getWidth(); - final int viewHeight = view.getHeight(); - final int viewCenterX = screenPos[0] + viewWidth / 2; - final int screenWidth = context.getResources().getDisplayMetrics().widthPixels; - final int estimatedToastHeight = (int) (ESTIMATED_TOAST_HEIGHT_DIPS - * context.getResources().getDisplayMetrics().density); - - Toast longClickText = Toast.makeText(context, text, Toast.LENGTH_SHORT); - boolean showBelow = screenPos[1] < estimatedToastHeight; - if (showBelow) { - // Show below - // Offsets are after decorations (e.g. status bar) are factored in - longClickText.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL, - viewCenterX - screenWidth / 2, - screenPos[1] - displayFrame.top + viewHeight); - } else { - // Show above - // Offsets are after decorations (e.g. status bar) are factored in - // NOTE: We can't use Gravity.BOTTOM because when the keyboard is up - // its height isn't factored in. - longClickText.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL, - viewCenterX - screenWidth / 2, - screenPos[1] - displayFrame.top - estimatedToastHeight); - } - - longClickText.show(); - return true; - } - -} diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 88c19c1a6..d9e7170c5 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -124,7 +124,7 @@ android:src="@drawable/ic_repeat_grey_24dp" android:padding="12dp" android:background="?android:selectableItemBackground" - android:contentDescription="@string/exchange_keys"/> + android:contentDescription="@string/cd_exchange_keys"/> diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index a6f9fd17f..7c021bec2 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -94,7 +94,7 @@ "Add" "Save as default" "Saved!" - "Exchange Keys" - "Encrypt Files" - "Encrypt Text" - "Share Via NFC" + + + "Encrypt Files" + "Exchange Keys" + "Encrypt Text" + "Share Via NFC" "Settings" -- cgit v1.2.3