Changeset f907928 in dispositivos_moviles for TibisayMovil/src/ve/gob/cenditel/tibisaymovil/SignResultHandwrittenSignatureActivity.java

Timestamp:

Oct 22, 2013, 3:53:16 PM (11 years ago)

Author:

Jose Ruiz <joseruiz@…>

Branches:

master

Children:

3fe55cf

Parents:

288126d (diff), c231890 (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/AndroidManifest?.xml
TibisayMovil?/gen/net/neiti/droidtext/R.java
TibisayMovil?/gen/ve/gob/cenditel/tibisaymovil/R.java
TibisayMovil?/src/ve/gob/cenditel/tibisaymovil/CertificateRepositoryActivity.java
TibisayMovil?/src/ve/gob/cenditel/tibisaymovil/TibisayMovilActivity.java

File:

• TibisayMovil/src/ve/gob/cenditel/tibisaymovil/SignResultHandwrittenSignatureActivity.java (modified) (2 diffs)

TibisayMovil/src/ve/gob/cenditel/tibisaymovil/SignResultHandwrittenSignatureActivity.java

@@ -44 +44 @@
                         getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.title_bar);
 
-        TextView archivo_para_firm = (TextView) this.findViewById(R.id.archivo_para_firmar_path);
-        TextView imagen_utlizada= (TextView) this.findViewById(R.id.imagen_utlizada_name);
-        TextView archivo_firmado = (TextView) this.findViewById(R.id.archivo_firmado_path);
+        TextView archivo_para_firm = (TextView) this.findViewById(R.id.archivo_original_a_cifrar);
+        TextView imagen_utlizada= (TextView) this.findViewById(R.id.archivo_cifrado);
+        TextView archivo_firmado = (TextView) this.findViewById(R.id.destinatario);
 
         archivo_para_firm.setText(fileToSign);
@@ -52 +52 @@
         archivo_firmado.setText(pathFileSigned+fileSigned);
 
-        button_share = (LinearLayout) this.findViewById(R.id.button_share_zone);
-        button_finish = (LinearLayout) this.findViewById(R.id.button_finish_zone);          
+        button_share = (LinearLayout) this.findViewById(R.id.button_remove_certificate_zone);
+        button_finish = (LinearLayout) this.findViewById(R.id.button_add_certificate_zone);