Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev

Browse Source 
* commit '6c642089bcd13bf17d7c445b2ec89b62a79c9823':
  Add programmatic access to setters in TextClock Bug #7478328
This commit is contained in:
Romain Guy
2012-11-05 16:39:37 -08:00
committed by Android Git Automerger
parent 48275d2de9 6c642089bc
commit 06da337876
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/TextClock.java
View File

@@ -29,6 +29,7 @@ import android.os.SystemClock;
import android.provider.Settings; import android.provider.Settings;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.RemotableViewMethod;
import com.android.internal.R; import com.android.internal.R;
@@ -266,6 +267,7 @@ public class TextClock extends TextView {
* *
* @attr ref android.R.styleable#TextClock_format12Hour * @attr ref android.R.styleable#TextClock_format12Hour
*/ */
@RemotableViewMethod
public void setFormat12Hour(CharSequence format) { public void setFormat12Hour(CharSequence format) {
mFormat12 = format; mFormat12 = format;
@@ -307,6 +309,7 @@ public class TextClock extends TextView {
* *
* @attr ref android.R.styleable#TextClock_format24Hour * @attr ref android.R.styleable#TextClock_format24Hour
*/ */
@RemotableViewMethod
public void setFormat24Hour(CharSequence format) { public void setFormat24Hour(CharSequence format) {
mFormat24 = format; mFormat24 = format;
@@ -366,6 +369,7 @@ public class TextClock extends TextView {
* *
* @attr ref android.R.styleable#TextClock_timeZone * @attr ref android.R.styleable#TextClock_timeZone
*/ */
@RemotableViewMethod
public void setTimeZone(String timeZone) { public void setTimeZone(String timeZone) {
mTimeZone = timeZone; mTimeZone = timeZone;