spring-cleaning: remove unused resources, rename strings from camelCase to snake_case to follow standard practice

This commit is contained in:
Dominik Schürmann
2013-10-25 21:46:05 +02:00
parent 283037acf5
commit 2f81c2fb0f
147 changed files with 506 additions and 9882 deletions

View File

@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:singleLine="true"
android:layout_marginRight="?android:attr/scrollbarSize"
android:paddingLeft="6dip"
android:paddingTop="6dip"
android:paddingBottom="6dip"
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight">
<TextView
android:id="@+id/accountName"
android:text="someone@gmail.com"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
</LinearLayout>

View File

@@ -88,7 +88,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/label_encryptionAlgorithm"
android:text="@string/label_encryption_algorithm"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Spinner
@@ -99,7 +99,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/label_hashAlgorithm"
android:text="@string/label_hash_algorithm"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Spinner
@@ -110,7 +110,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/label_messageCompression"
android:text="@string/label_message_compression"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Spinner

View File

@@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="4dp"
android:text="@string/keyCreationElGamalInfo" />
android:text="@string/key_creation_el_gamal_info" />
<TableRow>
@@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="4dp"
android:text="@string/label_keySize" />
android:text="@string/label_key_size" />
<Spinner
android:id="@+id/create_key_size"

View File

@@ -170,7 +170,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_deleteAfterDecryption" />
android:text="@string/label_delete_after_decryption" />
</LinearLayout>
</LinearLayout>
</ViewFlipper>

View File

@@ -33,20 +33,20 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="4dp"
android:text="@string/label_passPhrase" />
android:text="@string/label_passphrase" />
<CheckBox
android:id="@+id/edit_key_no_passphrase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_noPassPhrase" />
android:text="@string/label_no_passphrase" />
<Button
android:id="@+id/edit_key_btn_change_pass_phrase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dp"
android:text="@string/btn_setPassPhrase" />
android:text="@string/btn_set_passphrase" />
<LinearLayout
android:id="@+id/edit_key_container"

View File

@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:text="@string/label_keyId" />
android:text="@string/label_key_id" />
<TextView
android:id="@+id/keyId"

View File

@@ -24,7 +24,7 @@
android:id="@+id/isMainUserId"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_mainUserId" />
android:text="@string/label_main_user_id" />
<LinearLayout
android:layout_width="fill_parent"

View File

@@ -119,7 +119,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:text="@string/label_selectPublicKeys"
android:text="@string/label_select_public_keys"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Button
@@ -127,7 +127,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/btn_selectEncryptKeys" />
android:text="@string/btn_select_encrypt_keys" />
</LinearLayout>
</LinearLayout>
@@ -146,7 +146,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:text="@string/label_passPhrase"
android:text="@string/label_passphrase"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
@@ -164,7 +164,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:text="@string/label_passPhraseAgain"
android:text="@string/label_passphrase_again"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
@@ -264,7 +264,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:paddingRight="10dip"
android:text="@string/label_fileCompression"
android:text="@string/label_file_compression"
android:textAppearance="?android:attr/textAppearanceSmall" />
<Spinner
@@ -284,7 +284,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_deleteAfterEncryption" />
android:text="@string/label_delete_after_encryption" />
</LinearLayout>
<LinearLayout
@@ -297,7 +297,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_asciiArmour" />
android:text="@string/label_ascii_armor" />
</LinearLayout>
</LinearLayout>
</ViewFlipper>

View File

@@ -44,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:contentDescription="@string/filemanager_titleOpen"
android:contentDescription="@string/filemanager_title_open"
android:src="@drawable/ic_menu_filebrowser" />
</LinearLayout>

View File

@@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dip"
android:orientation="horizontal">
<TextView
android:id="@+id/filterInfo"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="end"/>
<Button
android:id="@+id/btn_clear"
android:text="@string/btn_clearFilter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>

View File

@@ -1,59 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<ListView
android:id="@+id/options"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:padding="5dip"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="@android:style/ButtonBar">
<Button
android:text="dummy"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="invisible"/>
<Button
android:id="@+id/btn_cancel"
android:text="@android:string/cancel"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_weight="2"/>
<Button
android:text="dummy"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="invisible"/>
</LinearLayout>
</LinearLayout>

View File

@@ -5,10 +5,9 @@
android:orientation="vertical" >
<android.support.v4.view.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent">
</android.support.v4.view.ViewPager>
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

View File

@@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:contentDescription="@string/filemanager_titleOpen"
android:contentDescription="@string/filemanager_title_open"
android:src="@drawable/ic_menu_filebrowser" />
</LinearLayout>

View File

@@ -7,7 +7,7 @@
android:id="@+id/import_keyserver_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/menu_keyServer" />
android:text="@string/menu_key_server" />
<!-- <Spinner -->
<!-- android:id="@+id/import_keys_server_key_server" -->

View File

@@ -8,6 +8,6 @@
android:id="@+id/import_nfc_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/menu_importFromNfc" />
android:text="@string/menu_import_from_nfc" />
</LinearLayout>

View File

@@ -8,7 +8,7 @@
android:id="@+id/import_qrcode_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/menu_importFromQrCode" />
android:text="@string/menu_import_from_qr_code" />
<TextView
android:id="@+id/import_qrcode_text"

View File

@@ -20,6 +20,6 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="3dp"
android:text="@string/listInformation" />
android:text="@string/list_information" />
</LinearLayout>

View File

@@ -20,6 +20,6 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="3dp"
android:text="@string/listInformation" />
android:text="@string/list_information" />
</LinearLayout>

View File

@@ -35,7 +35,7 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/hint_secretKeys"
android:hint="@string/hint_secret_keys"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:singleLine="true" />

View File

@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="4dp"
android:text="@string/label_passPhrase" />
android:text="@string/label_passphrase" />
<EditText
android:id="@+id/passphrase_passphrase"

View File

@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="4dp"
android:text="@string/label_passPhrase" />
android:text="@string/label_passphrase" />
<EditText
android:id="@+id/passphrase_passphrase"
@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="4dp"
android:text="@string/label_passPhraseAgain" />
android:text="@string/label_passphrase_again" />
<EditText
android:id="@+id/passphrase_passphrase_again"

View File

@@ -19,7 +19,7 @@
android:layout_height="wrap_content" android:orientation="horizontal">
<TextView android:id="@+id/textView1" android:layout_height="wrap_content"
android:text="@string/label_sendKey" android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/label_send_key" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"></TextView>
<CheckBox android:text="" android:id="@+id/sendKey"
android:layout_width="wrap_content" android:layout_height="wrap_content"