diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java index 33d501a4e..801f5d04b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java @@ -24,9 +24,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -124,23 +121,6 @@ public class ImportKeysFileFragment extends Fragment { } } - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - inflater.inflate(R.menu.import_keys_file_fragment, menu); - super.onCreateOptionsMenu(menu, inflater); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.import_all_keys: - mCallback.importKeys(); - return true; - } - - return false; - } - @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml index e2dac570a..a055264b3 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml @@ -70,8 +70,9 @@ android:drawablePadding="8dp" android:drawableRight="@drawable/ic_file_download_white_24dp" android:gravity="center_vertical" - android:text="@string/menu_import_all_keys" - android:textColor="#ffffffff" /> + android:text="@string/btn_import_all" + android:textAllCaps="true" + android:textColor="?android:attr/textColorPrimary" /> diff --git a/OpenKeychain/src/main/res/menu/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/menu/import_keys_file_fragment.xml deleted file mode 100644 index 16dc6b555..000000000 --- a/OpenKeychain/src/main/res/menu/import_keys_file_fragment.xml +++ /dev/null @@ -1,8 +0,0 @@ - -
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index cceb83a6b..c75e342ed 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -134,7 +134,6 @@