diff options
author | Nick Pelly <npelly@google.com> | 2011-08-23 19:35:13 -0700 |
---|---|---|
committer | Nick Pelly <npelly@google.com> | 2011-08-26 16:35:44 -0700 |
commit | 0fb33abfb468f495b3223e08b3920aab86bea696 (patch) | |
tree | 0c735985131a0ddbde3d432256878e00b65ba563 /res | |
parent | 2aaf687aa6b92b193f6716ab9d057ea439804402 (diff) | |
download | packages_apps_settings-0fb33abfb468f495b3223e08b3920aab86bea696.zip packages_apps_settings-0fb33abfb468f495b3223e08b3920aab86bea696.tar.gz packages_apps_settings-0fb33abfb468f495b3223e08b3920aab86bea696.tar.bz2 |
Rename {zeroclick, share_tap} -> ndef_push in code.
Not sure what the product name will be, but ndef push seems to be a
nice neutral name for the code.
Text strings are left as "Share Tap" for now.
Change-Id: I9dbf82eda2273220c23f443710a340c2c93e8291
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/ndef_push_anim.xml (renamed from res/drawable/sharetap_anim.xml) | 0 | ||||
-rw-r--r-- | res/layout/ndefpush.xml (renamed from res/layout/sharetap.xml) | 10 | ||||
-rw-r--r-- | res/values/strings.xml | 18 | ||||
-rw-r--r-- | res/xml/wireless_settings.xml | 8 |
4 files changed, 18 insertions, 18 deletions
diff --git a/res/drawable/sharetap_anim.xml b/res/drawable/ndef_push_anim.xml index 6aa7d4f..6aa7d4f 100644 --- a/res/drawable/sharetap_anim.xml +++ b/res/drawable/ndef_push_anim.xml diff --git a/res/layout/sharetap.xml b/res/layout/ndefpush.xml index bd65df2..6892850 100644 --- a/res/layout/sharetap.xml +++ b/res/layout/ndefpush.xml @@ -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> diff --git a/res/values/strings.xml b/res/values/strings.xml index 296f5d8..87be0e6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1098,15 +1098,15 @@ <!-- NFC settings --> <!-- Used in the 1st-level settings screen to turn on NFC --> <string name="nfc_quick_toggle_title">NFC</string> - <!-- Used to enter the ShareTap sharing preferences screen --> - <string name="zeroclick_settings_title">ShareTap</string> - <string name="zeroclick_settings_summary"></string> - <string name="zeroclick_on_summary">On</string> - <string name="zeroclick_off_summary">Off</string> - <!-- Used in the zero-click sharing preferences screen --> - <string name="zeroclick_label">ShareTap</string> - <string name="zeroclick_explained">Share content by touching two NFC-enabled devices back to back.</string> - <string name="zeroclick_top">The app on the top device\'s screen sends content to the bottom device.\n\nYour data is safe: nothing is shared unless both devices are on and unlocked.\n\nYou can turn this feature off in Settings > More > ShareTap.</string> + <!-- Used to enter the NdefPush sharing preferences screen --> + <string name="ndef_push_settings_title">ShareTap</string> + <string name="ndef_push_settings_summary"></string> + <string name="ndef_push_on_summary">On</string> + <string name="ndef_push_off_summary">Off</string> + <!-- Used in the NdefPush sharing preferences screen --> + <string name="ndef_push_label">ShareTap</string> + <string name="ndef_push_explained">Share content by touching two NFC-enabled devices back to back.</string> + <string name="ndef_push_top">The app on the top device\'s screen sends content to the bottom device.\n\nYour data is safe: nothing is shared unless both devices are on and unlocked.\n\nYou can turn this feature off in Settings > More > ShareTap.</string> <!-- Wi-Fi Settings --> <skip /> <!-- Used in the 1st-level settings screen to turn on Wi-Fi --> <string name="wifi_quick_toggle_title">Wi-Fi</string> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index d908fd7..81929d0 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -39,10 +39,10 @@ android:persistent="false" /> <PreferenceScreen - android:fragment="com.android.settings.nfc.ShareTap" - android:key="zeroclick_settings" - android:title="@string/zeroclick_settings_title" - android:summary="@string/zeroclick_settings_summary" > + android:fragment="com.android.settings.nfc.NdefPush" + android:key="ndef_push_settings" + android:title="@string/ndef_push_settings_title" + android:summary="@string/ndef_push_settings_summary" > </PreferenceScreen> <PreferenceScreen |