/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to res/layout/doit.xml

  • Committer: edam
  • Date: 2011-05-30 15:33:01 UTC
  • Revision ID: edam@waxworlds.org-20110530153301-oor6ci9b3hf9clul
- refactored some code to do with how contacts are imported
- Vcards (and ContactData) instances now generate a CacheIdentifier when they are finalised so that ContactData instances that do not have enough information to identify them can be discovered then
- importContact() now calls the private method checkForDuplicate(), renamed from isImportRequired(), and return if it is not
- importContact() and checkForDuplicate() now use the ContactData's generated CacheIdentifier

Show diffs side-by-side

added added

removed removed

res/layout/doit.xml
21
21
 *
22
22
 * You should have received a copy of the GNU General Public License
23
23
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
24
 
 -->
 
24
-->
25
25
 
26
26
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent">
27
27
 
72
72
                                        </LinearLayout>
73
73
 
74
74
                                        <TextView android:id="@+id/doit_alldone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_alldone" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dp" android:visibility="gone" />
 
75
                                        <TextView android:id="@+id/doit_aborted" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_aborted" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dp" android:visibility="gone" />
75
76
 
76
77
                                </LinearLayout>
77
78