summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2012-11-05 16:35:45 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-05 16:36:39 -0800
commit6c642089bcd13bf17d7c445b2ec89b62a79c9823 (patch)
tree08be0f779e2a46a90d3c7895096062d0c56563d8 /core/java
parent00b5ed8fa9f2f38e15894519f3afeaae56e97e94 (diff)
parenta9cfe677eec0324a94509c6a5d29cec5b8a7a7cf (diff)
downloadframeworks_base-6c642089bcd13bf17d7c445b2ec89b62a79c9823.zip
frameworks_base-6c642089bcd13bf17d7c445b2ec89b62a79c9823.tar.gz
frameworks_base-6c642089bcd13bf17d7c445b2ec89b62a79c9823.tar.bz2
Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/TextClock.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java
index 4c46658..908eb0a 100644
--- a/core/java/android/widget/TextClock.java
+++ b/core/java/android/widget/TextClock.java
@@ -29,6 +29,7 @@ import android.os.SystemClock;
import android.provider.Settings;
import android.text.format.DateFormat;
import android.util.AttributeSet;
+import android.view.RemotableViewMethod;
import com.android.internal.R;
@@ -266,6 +267,7 @@ public class TextClock extends TextView {
*
* @attr ref android.R.styleable#TextClock_format12Hour
*/
+ @RemotableViewMethod
public void setFormat12Hour(CharSequence format) {
mFormat12 = format;
@@ -307,6 +309,7 @@ public class TextClock extends TextView {
*
* @attr ref android.R.styleable#TextClock_format24Hour
*/
+ @RemotableViewMethod
public void setFormat24Hour(CharSequence format) {
mFormat24 = format;
@@ -366,6 +369,7 @@ public class TextClock extends TextView {
*
* @attr ref android.R.styleable#TextClock_timeZone
*/
+ @RemotableViewMethod
public void setTimeZone(String timeZone) {
mTimeZone = timeZone;