Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11e65c36 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 851f2b0e: am 6c642089: Merge "Add programmatic access to setters in... 

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

* commit '851f2b0e':
  Add programmatic access to setters in TextClock Bug #7478328
parents 063de3b9 851f2b0e

core/java/android/widget/TextClock.java

+4 −0
Original line number Diff line number Diff line
@@ -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;