summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2011-08-02 10:40:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-02 10:40:09 -0700
commit8d7f9594cdcfd3e88c67db195aca6accc3c10274 (patch)
tree18d5dfc5b421da27d71b6ae19324a7eb38f51531 /src
parent688605ec02f99ecd424aeaf31f5e966bbee5f6be (diff)
parentb00f4a5ac5bd9bf60215f05550f85607b935fa3b (diff)
downloadpackages_apps_settings-8d7f9594cdcfd3e88c67db195aca6accc3c10274.zip
packages_apps_settings-8d7f9594cdcfd3e88c67db195aca6accc3c10274.tar.gz
packages_apps_settings-8d7f9594cdcfd3e88c67db195aca6accc3c10274.tar.bz2
Merge "Fix ActionBar title for NFC sharing."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/nfc/ZeroClick.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/nfc/ZeroClick.java b/src/com/android/settings/nfc/ZeroClick.java
index 4d657d9..5c67e52 100644
--- a/src/com/android/settings/nfc/ZeroClick.java
+++ b/src/com/android/settings/nfc/ZeroClick.java
@@ -56,6 +56,7 @@ public class ZeroClick extends Fragment
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+ activity.getActionBar().setTitle(R.string.zeroclick_settings_title);
}
}