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

Commit 8f32cd43 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Changed the name of chronometer countdown" into nyc-dev

parents 5486aabc c3b752e7

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -47464,7 +47464,7 @@ package android.widget { 
    method public void setChar(int, java.lang.String, char);

    method public void setCharSequence(int, java.lang.String, java.lang.CharSequence);

    method public void setChronometer(int, long, java.lang.String, boolean);

    method public void setChronometerCountsDown(int, boolean);

    method public void setChronometerCountDown(int, boolean);

    method public void setContentDescription(int, java.lang.CharSequence);

    method public void setDisplayedChild(int, int);

    method public void setDouble(int, java.lang.String, double);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -50773,7 +50773,7 @@ package android.widget { 
    method public void setChar(int, java.lang.String, char);

    method public void setCharSequence(int, java.lang.String, java.lang.CharSequence);

    method public void setChronometer(int, long, java.lang.String, boolean);

    method public void setChronometerCountsDown(int, boolean);

    method public void setChronometerCountDown(int, boolean);

    method public void setContentDescription(int, java.lang.CharSequence);

    method public void setDisplayedChild(int, int);

    method public void setDouble(int, java.lang.String, double);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -47541,7 +47541,7 @@ package android.widget { 
    method public void setChar(int, java.lang.String, char);

    method public void setCharSequence(int, java.lang.String, java.lang.CharSequence);

    method public void setChronometer(int, long, java.lang.String, boolean);

    method public void setChronometerCountsDown(int, boolean);

    method public void setChronometerCountDown(int, boolean);

    method public void setContentDescription(int, java.lang.CharSequence);

    method public void setDisplayedChild(int, int);

    method public void setDouble(int, java.lang.String, double);

core/java/android/app/Notification.java

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.annotation.SystemApi; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.ColorStateList;
@@ -3260,7 +3259,7 @@ public class Notification implements Parcelable 
                            mN.when + (SystemClock.elapsedRealtime() - System.currentTimeMillis()));

                    contentView.setBoolean(R.id.chronometer, "setStarted", true);

                    boolean countsDown = mN.extras.getBoolean(EXTRA_CHRONOMETER_COUNTS_DOWN);

                    contentView.setChronometerCountsDown(R.id.chronometer, countsDown);

                    contentView.setChronometerCountDown(R.id.chronometer, countsDown);

                } else {

                    contentView.setViewVisibility(R.id.time, View.VISIBLE);

                    contentView.setLong(R.id.time, "setTime", mN.when);

core/java/android/widget/RemoteViews.java

+2 −2
Original line number Diff line number Diff line
@@ -2600,7 +2600,7 @@ public class RemoteViews implements Parcelable, Filter { 
     *               simply display the timer value.

     * @param started True if you want the clock to be started, false if not.

     *

     * @see #setChronometerCountsDown(int, boolean)

     * @see #setChronometerCountDown(int, boolean)

     */

    public void setChronometer(int viewId, long base, String format, boolean started) {

        setLong(viewId, "setBase", base);
@@ -2616,7 +2616,7 @@ public class RemoteViews implements Parcelable, Filter { 
     * @param isCountDown True if you want the chronometer to count down to base instead of

     *                    counting up.

     */

    public void setChronometerCountsDown(int viewId, boolean isCountDown) {

    public void setChronometerCountDown(int viewId, boolean isCountDown) {

        setBoolean(viewId, "setCountDown", isCountDown);

    }