cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Lint changes"

Browse Source 
This reverts commit e00436b409.
This commit is contained in:
Dominik Schürmann
2014-03-10 18:23:47 +01:00
parent ef8eb3f8b5
commit d91e2673d7
14 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
View File

@@ -14,7 +14,7 @@
limitations under the License.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/actionbar_cancel"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="0dp"
@@ -33,4 +33,4 @@
style="@style/Widget.AppCompat.Light.ActionBar.TabText"
android:text="Cancel (set in-code!)" />
</merge>
</FrameLayout>

4
OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
View File

@@ -14,7 +14,7 @@
limitations under the License.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/actionbar_done"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="0dp"
@@ -33,4 +33,4 @@
style="@style/Widget.AppCompat.Light.ActionBar.TabText"
android:text="Done (set in-code!)" />
</merge>
</FrameLayout>

13
OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
View File

@@ -5,11 +5,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:orientation="vertical">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:orientation="vertical">
android:fillViewport="true">
<LinearLayout
android:layout_width="match_parent"
@@ -68,6 +73,7 @@
android:layout_gravity="left"
android:text="@string/label_main_user_id"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_alignTop="@+id/linearLayout"
android:layout_toRightOf="@+id/relativeLayout" />
<TextView
@@ -200,6 +206,7 @@
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
<include layout="@layout/drawer_list" />

1
OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
View File

@@ -12,6 +12,7 @@
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#fff"
android:choiceMode="singleChoice"
android:divider="@color/bg_gray"
android:dividerHeight="1dp" />

3
OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
View File

@@ -71,8 +71,7 @@
android:id="@+id/comment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="text"/>
android:layout_weight="1" />
</TableRow>
</TableLayout>

2
OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
View File

@@ -13,7 +13,7 @@
<EditText
android:id="@+id/server"
android:layout_width="0dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="textUri" />

2
OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
View File

@@ -14,7 +14,7 @@
android:orientation="horizontal" >
<RelativeLayout
android:layout_width="0dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6sp"
android:layout_marginLeft="16sp"