moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

Renaming for consisitency

Browse Source
This commit is contained in:
Dominik Schürmann 2015-05-06 03:29:04 +02:00
parent f102ae5da5
commit 8de6589c9d
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
View File

@ -31,7 +31,6 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
@ -87,12 +86,12 @@ public class DecryptFilesFragment extends DecryptFragment {
*/ */
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.decrypt_file_fragment, container, false); View view = inflater.inflate(R.layout.decrypt_files_fragment, container, false);
mFilename = (TextView) view.findViewById(R.id.decrypt_file_filename); mFilename = (TextView) view.findViewById(R.id.decrypt_files_filename);
mDeleteAfter = (CheckBox) view.findViewById(R.id.decrypt_file_delete_after_decryption); mDeleteAfter = (CheckBox) view.findViewById(R.id.decrypt_files_delete_after_decryption);
mDecryptButton = view.findViewById(R.id.decrypt_file_action_decrypt); mDecryptButton = view.findViewById(R.id.decrypt_files_action_decrypt);
view.findViewById(R.id.decrypt_file_browse).setOnClickListener(new View.OnClickListener() { view.findViewById(R.id.decrypt_files_browse).setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
FileHelper.openDocument(DecryptFilesFragment.this, "*/*", REQUEST_CODE_INPUT); FileHelper.openDocument(DecryptFilesFragment.this, "*/*", REQUEST_CODE_INPUT);

10
OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml → OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml
View File

@ -41,7 +41,7 @@
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:orientation="horizontal" android:orientation="horizontal"
android:id="@+id/decrypt_file_browse" android:id="@+id/decrypt_files_browse"
android:clickable="true" android:clickable="true"
android:background="?android:selectableItemBackground"> android:background="?android:selectableItemBackground">
@ -54,7 +54,7 @@
android:gravity="center_vertical" /> android:gravity="center_vertical" />
<TextView <TextView
android:id="@+id/decrypt_file_filename" android:id="@+id/decrypt_files_filename"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
@ -73,7 +73,7 @@
android:layout_marginBottom="8dp" /> android:layout_marginBottom="8dp" />
<CheckBox <CheckBox
android:id="@+id/decrypt_file_delete_after_decryption" android:id="@+id/decrypt_files_delete_after_decryption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_delete_after_decryption" /> android:text="@string/label_delete_after_decryption" />
@ -83,7 +83,7 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <TextView
android:id="@+id/decrypt_file_action_decrypt" android:id="@+id/decrypt_files_action_decrypt"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
@ -104,7 +104,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dip" android:layout_height="1dip"
android:background="?android:attr/listDivider" android:background="?android:attr/listDivider"
android:layout_above="@+id/decrypt_file_action_decrypt" /> android:layout_above="@+id/decrypt_files_action_decrypt" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>