Merge "Rename {zeroclick, share_tap} -> ndef_push in code."

This commit is contained in:
Nick Pelly
2011-08-26 17:31:31 -07:00
committed by Android (Google) Code Review
8 changed files with 46 additions and 46 deletions

View File

@@ -30,23 +30,23 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView android:id="@+id/sharetap_explained"
<TextView android:id="@+id/ndef_push_explained"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:gravity="top"
android:text="@string/zeroclick_explained"
android:text="@string/ndef_push_explained"
/>
<ImageView android:id="@+id/sharetap_image"
<ImageView android:id="@+id/ndef_push_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<TextView android:id="@+id/sharetap_safety"
<TextView android:id="@+id/ndef_push_safety"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:gravity="top"
android:text="@string/zeroclick_top"
android:text="@string/ndef_push_top"
/>
</LinearLayout>