summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2016-04-20 16:13:59 -0700
committer Selim Cinek <cinek@google.com> 2016-04-21 15:07:08 -0700
commitc3b752e712f5ce6a3ddaad5c585345dce7ababe5 (patch)
tree67d8fdafe34f4b9793a88305796cd302f89e323d
parent36d570863aad37c949e578ca7a8e45abfd36d5c8 (diff)
Changed the name of chronometer countdown
Change-Id: Ie0339205b26f2dff40e0c19760750a0ce6aaf7da Fixes: 28295825
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--api/test-current.txt2
-rw-r--r--core/java/android/app/Notification.java3
-rw-r--r--core/java/android/widget/RemoteViews.java4
5 files changed, 6 insertions, 7 deletions
diff --git a/api/current.txt b/api/current.txt
index 5df8750fcb7c..4562dcd736c6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -47459,7 +47459,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);
diff --git a/api/system-current.txt b/api/system-current.txt
index acb699d26a05..226916a53e45 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -50761,7 +50761,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);
diff --git a/api/test-current.txt b/api/test-current.txt
index e4b11bd2d4b5..4d39d1c4548e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -47536,7 +47536,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);
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 400a313979d8..fa6995ad44e4 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -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);
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index a9b7f4e97e7c..6dc5ff7c427a 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -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);
}