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

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

Browse Source 
am: 8f32cd4306

* commit '8f32cd4306a201c2167c20fc636fe613f1fabd4c':
  Changed the name of chronometer countdown

Change-Id: Id89cb8d2bf201752bab018d25068841714405c3b
This commit is contained in:
Selim Cinek
2016-04-22 03:40:30 +00:00
committed by android-build-merger
parent f152a8ed35 8f32cd4306
commit ba26bf8a47
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -47464,7 +47464,7 @@ package android.widget {
method public void setChar(int, java.lang.String, char); method public void setChar(int, java.lang.String, char);
method public void setCharSequence(int, java.lang.String, java.lang.CharSequence); method public void setCharSequence(int, java.lang.String, java.lang.CharSequence);
method public void setChronometer(int, long, java.lang.String, boolean); 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 setContentDescription(int, java.lang.CharSequence);
method public void setDisplayedChild(int, int); method public void setDisplayedChild(int, int);
method public void setDouble(int, java.lang.String, double); method public void setDouble(int, java.lang.String, double);

2
api/system-current.txt
View File

@@ -50773,7 +50773,7 @@ package android.widget {
method public void setChar(int, java.lang.String, char); method public void setChar(int, java.lang.String, char);
method public void setCharSequence(int, java.lang.String, java.lang.CharSequence); method public void setCharSequence(int, java.lang.String, java.lang.CharSequence);
method public void setChronometer(int, long, java.lang.String, boolean); 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 setContentDescription(int, java.lang.CharSequence);
method public void setDisplayedChild(int, int); method public void setDisplayedChild(int, int);
method public void setDouble(int, java.lang.String, double); method public void setDouble(int, java.lang.String, double);

2
api/test-current.txt
View File

@@ -47541,7 +47541,7 @@ package android.widget {
method public void setChar(int, java.lang.String, char); method public void setChar(int, java.lang.String, char);
method public void setCharSequence(int, java.lang.String, java.lang.CharSequence); method public void setCharSequence(int, java.lang.String, java.lang.CharSequence);
method public void setChronometer(int, long, java.lang.String, boolean); 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 setContentDescription(int, java.lang.CharSequence);
method public void setDisplayedChild(int, int); method public void setDisplayedChild(int, int);
method public void setDouble(int, java.lang.String, double); method public void setDouble(int, java.lang.String, double);

3
core/java/android/app/Notification.java
View File

@@ -25,7 +25,6 @@ import android.annotation.SystemApi;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
@@ -3260,7 +3259,7 @@ public class Notification implements Parcelable
mN.when + (SystemClock.elapsedRealtime() - System.currentTimeMillis())); mN.when + (SystemClock.elapsedRealtime() - System.currentTimeMillis()));
contentView.setBoolean(R.id.chronometer, "setStarted", true); contentView.setBoolean(R.id.chronometer, "setStarted", true);
boolean countsDown = mN.extras.getBoolean(EXTRA_CHRONOMETER_COUNTS_DOWN); boolean countsDown = mN.extras.getBoolean(EXTRA_CHRONOMETER_COUNTS_DOWN);
contentView.setChronometerCountsDown(R.id.chronometer, countsDown); contentView.setChronometerCountDown(R.id.chronometer, countsDown);
} else { } else {
contentView.setViewVisibility(R.id.time, View.VISIBLE); contentView.setViewVisibility(R.id.time, View.VISIBLE);
contentView.setLong(R.id.time, "setTime", mN.when); contentView.setLong(R.id.time, "setTime", mN.when);

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

@@ -2600,7 +2600,7 @@ public class RemoteViews implements Parcelable, Filter {
* simply display the timer value. * simply display the timer value.
* @param started True if you want the clock to be started, false if not. * @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) { public void setChronometer(int viewId, long base, String format, boolean started) {
setLong(viewId, "setBase", base); 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 * @param isCountDown True if you want the chronometer to count down to base instead of
* counting up. * counting up.
*/ */
public void setChronometerCountsDown(int viewId, boolean isCountDown) { public void setChronometerCountDown(int viewId, boolean isCountDown) {
setBoolean(viewId, "setCountDown", isCountDown); setBoolean(viewId, "setCountDown", isCountDown);
} }