Changeset c874484 in dispositivos_moviles for TibisayMovil/res/layout/activity_encryption_result.xml

Timestamp:

Oct 23, 2013, 4:33:49 PM (11 years ago)

Author:

Antonio Araujo Brett <aaraujo@…>

Branches:

master

Children:

292b560

Parents:

f0566b4 (diff), 8243993 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of https://tibisay.cenditel.gob.ve/trac/scm/git/dispositivos_moviles

Conflicts:

TibisayMovil?/gen/net/neiti/droidtext/R.java
TibisayMovil?/gen/ve/gob/cenditel/tibisaymovil/R.java

File:

• TibisayMovil/res/layout/activity_encryption_result.xml (modified) (4 diffs)

TibisayMovil/res/layout/activity_encryption_result.xml

@@ -4 +4 @@
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:id="@+id/recipient_certificate_layout">
+    android:id="@+id/decryption_result_layout">
     
     <TextView
-        android:id="@+id/label_archivo_a_cifrar"
+        android:id="@+id/label_archivo_a_descifrar"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -18 +18 @@
 
     <TextView
-        android:id="@+id/archivo_original_a_cifrar"
+        android:id="@+id/archivo_original_a_descifrar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -27 +27 @@
     
     <TextView
-        android:id="@+id/label_archivo_cifrado"
+        android:id="@+id/label_archivo_original"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -38 +38 @@
 
     <TextView
-        android:id="@+id/archivo_cifrado"
+        android:id="@+id/archivo_descifrado"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"