Merge remote-tracking branch 'upstream/master' into Lint-error-fix

5 files changed, 119 insertions, 9 deletions

diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save.xml
new file mode 100644
index 000000000..f0dcf177c
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save.xml
@@ -0,0 +1,27 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      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="match_parent"
+    android:layout_height="match_parent"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:divider="@drawable/abc_list_divider_holo_light"
+    android:showDividers="end" >
+
+    <include layout="@layout/actionbar_include_save_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save_cancel.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save_cancel.xml
new file mode 100644
index 000000000..ba08a7714
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save_cancel.xml
@@ -0,0 +1,29 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      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="match_parent"
+    android:layout_height="match_parent"
+    android:dividerPadding="12dp"
+    android:divider="@drawable/abc_list_divider_holo_light"
+    android:orientation="horizontal"
+    android:showDividers="middle">
+
+    <include layout="@layout/actionbar_include_cancel_button" />
+
+    <include layout="@layout/actionbar_include_save_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_save_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_save_button.xml
new file mode 100644
index 000000000..86c59dcc5
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_save_button.xml
@@ -0,0 +1,36 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbar_save"
+    style="@style/Widget.AppCompat.ActionButton"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1">
+
+    <TextView
+        android:id="@+id/actionbar_save_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawableLeft="@drawable/ic_action_save"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:paddingRight="20dp"
+        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
+        android:text="Save (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml
index 2bdd231ee..ae523762c 100644
--- a/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml
@@ -6,7 +6,9 @@
     android:paddingRight="16dp"
     android:stretchColumns="1" >
 
-    <TableRow>
+    <TableRow
+        android:layout_marginBottom="5dip"
+        >
 
         <TextView
             android:id="@+id/passphrase_label_passphrase"
@@ -24,7 +26,9 @@
             android:padding="4dp" />
     </TableRow>
 
-    <TableRow>
+    <TableRow
+        android:layout_marginBottom="10dip"
+        >
 
         <TextView
             android:id="@+id/passphrase_label_passphrase_again"
diff --git a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
index 4a3cd3d28..1141091a3 100644
--- a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
@@ -3,7 +3,7 @@
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/select_secret_key_select_key_button"
@@ -25,31 +25,45 @@
         android:layout_marginLeft="4dp"
         android:layout_marginTop="4dp"
         android:orientation="vertical"
-        android:paddingLeft="16dp" >
+        android:paddingLeft="4dp">
 
         <!-- Has been made focusable to display error messages with setError -->
-
         <TextView
             android:id="@+id/select_secret_key_user_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="left"
             android:ellipsize="end"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:singleLine="true"
-            android:text="@string/api_settings_no_key"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:visibility="gone"
+            android:layout_marginRight="5dip"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
             android:id="@+id/select_secret_key_user_id_rest"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="left"
             android:ellipsize="end"
             android:singleLine="true"
+            android:layout_marginRight="5dip"
             android:text=""
+            android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/select_secret_key_master_key_hex"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="@string/api_settings_no_key"
+            android:layout_marginRight="5dip" />
+
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file