diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-06 03:29:04 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-06 03:29:04 +0200 |
| commit | 8de6589c9d4d6b9278ed4f46da7adbb6b81f1e30 (patch) | |
| tree | 55520660e801cd6b108a1bb03882a73f767e95d7 /OpenKeychain | |
| parent | f102ae5da5394f63298ed0c49195de8baf496bf0 (diff) | |
| download | open-keychain-8de6589c9d4d6b9278ed4f46da7adbb6b81f1e30.tar.gz open-keychain-8de6589c9d4d6b9278ed4f46da7adbb6b81f1e30.tar.bz2 open-keychain-8de6589c9d4d6b9278ed4f46da7adbb6b81f1e30.zip | |
Renaming for consisitency
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java | 11 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml (renamed from OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml) | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java index 96af45dd2..234362edc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java @@ -31,7 +31,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; -import android.widget.LinearLayout; import android.widget.TextView; import org.sufficientlysecure.keychain.Constants; @@ -87,12 +86,12 @@ public class DecryptFilesFragment extends DecryptFragment { */ @Override 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); - mDeleteAfter = (CheckBox) view.findViewById(R.id.decrypt_file_delete_after_decryption); - mDecryptButton = view.findViewById(R.id.decrypt_file_action_decrypt); - view.findViewById(R.id.decrypt_file_browse).setOnClickListener(new View.OnClickListener() { + mFilename = (TextView) view.findViewById(R.id.decrypt_files_filename); + mDeleteAfter = (CheckBox) view.findViewById(R.id.decrypt_files_delete_after_decryption); + mDecryptButton = view.findViewById(R.id.decrypt_files_action_decrypt); + view.findViewById(R.id.decrypt_files_browse).setOnClickListener(new View.OnClickListener() { public void onClick(View v) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { FileHelper.openDocument(DecryptFilesFragment.this, "*/*", REQUEST_CODE_INPUT); diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml index 8374c6aad..22ee7e09f 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml @@ -41,7 +41,7 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal" - android:id="@+id/decrypt_file_browse" + android:id="@+id/decrypt_files_browse" android:clickable="true" android:background="?android:selectableItemBackground"> @@ -54,7 +54,7 @@ android:gravity="center_vertical" /> <TextView - android:id="@+id/decrypt_file_filename" + android:id="@+id/decrypt_files_filename" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" @@ -73,7 +73,7 @@ android:layout_marginBottom="8dp" /> <CheckBox - android:id="@+id/decrypt_file_delete_after_decryption" + android:id="@+id/decrypt_files_delete_after_decryption" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/label_delete_after_decryption" /> @@ -83,7 +83,7 @@ android:layout_height="match_parent"> <TextView - android:id="@+id/decrypt_file_action_decrypt" + android:id="@+id/decrypt_files_action_decrypt" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" @@ -104,7 +104,7 @@ android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" - android:layout_above="@+id/decrypt_file_action_decrypt" /> + android:layout_above="@+id/decrypt_files_action_decrypt" /> </RelativeLayout> </LinearLayout> |