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

Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev

Browse Source
This commit is contained in:
Kirill Grouchnikov
2016-04-05 21:48:30 +00:00
committed by Android (Google) Code Review
parent 21e8e96f04 7cf1586ce4
commit 12454dcab1
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@@ -20328,8 +20328,8 @@ package android.media {
public class MediaActionSound {
ctor public MediaActionSound();
method public synchronized void load(int);
method public synchronized void play(int);
method public void load(int);
method public void play(int);
method public void release();
field public static final int FOCUS_COMPLETE = 1; // 0x1
field public static final int SHUTTER_CLICK = 0; // 0x0
@@ -46274,7 +46274,7 @@ package android.widget {
method public long getMinDate();
method public deprecated android.graphics.drawable.Drawable getSelectedDateVerticalBar();
method public deprecated int getSelectedWeekBackgroundColor();
method public boolean getShowWeekNumber();
method public deprecated boolean getShowWeekNumber();
method public deprecated int getShownWeekCount();
method public deprecated int getUnfocusedMonthDateColor();
method public int getWeekDayTextAppearance();
@@ -46291,7 +46291,7 @@ package android.widget {
method public deprecated void setSelectedDateVerticalBar(int);
method public deprecated void setSelectedDateVerticalBar(android.graphics.drawable.Drawable);
method public deprecated void setSelectedWeekBackgroundColor(int);
method public void setShowWeekNumber(boolean);
method public deprecated void setShowWeekNumber(boolean);
method public deprecated void setShownWeekCount(int);
method public deprecated void setUnfocusedMonthDateColor(int);
method public void setWeekDayTextAppearance(int);

8
api/system-current.txt
View File

@@ -21807,8 +21807,8 @@ package android.media {
public class MediaActionSound {
ctor public MediaActionSound();
method public synchronized void load(int);
method public synchronized void play(int);
method public void load(int);
method public void play(int);
method public void release();
field public static final int FOCUS_COMPLETE = 1; // 0x1
field public static final int SHUTTER_CLICK = 0; // 0x0
@@ -49371,7 +49371,7 @@ package android.widget {
method public long getMinDate();
method public deprecated android.graphics.drawable.Drawable getSelectedDateVerticalBar();
method public deprecated int getSelectedWeekBackgroundColor();
method public boolean getShowWeekNumber();
method public deprecated boolean getShowWeekNumber();
method public deprecated int getShownWeekCount();
method public deprecated int getUnfocusedMonthDateColor();
method public int getWeekDayTextAppearance();
@@ -49388,7 +49388,7 @@ package android.widget {
method public deprecated void setSelectedDateVerticalBar(int);
method public deprecated void setSelectedDateVerticalBar(android.graphics.drawable.Drawable);
method public deprecated void setSelectedWeekBackgroundColor(int);
method public void setShowWeekNumber(boolean);
method public deprecated void setShowWeekNumber(boolean);
method public deprecated void setShownWeekCount(int);
method public deprecated void setUnfocusedMonthDateColor(int);
method public void setWeekDayTextAppearance(int);

8
api/test-current.txt
View File

@@ -20393,8 +20393,8 @@ package android.media {
public class MediaActionSound {
ctor public MediaActionSound();
method public synchronized void load(int);
method public synchronized void play(int);
method public void load(int);
method public void play(int);
method public void release();
field public static final int FOCUS_COMPLETE = 1; // 0x1
field public static final int SHUTTER_CLICK = 0; // 0x0
@@ -46348,7 +46348,7 @@ package android.widget {
method public long getMinDate();
method public deprecated android.graphics.drawable.Drawable getSelectedDateVerticalBar();
method public deprecated int getSelectedWeekBackgroundColor();
method public boolean getShowWeekNumber();
method public deprecated boolean getShowWeekNumber();
method public deprecated int getShownWeekCount();
method public deprecated int getUnfocusedMonthDateColor();
method public int getWeekDayTextAppearance();
@@ -46365,7 +46365,7 @@ package android.widget {
method public deprecated void setSelectedDateVerticalBar(int);
method public deprecated void setSelectedDateVerticalBar(android.graphics.drawable.Drawable);
method public deprecated void setSelectedWeekBackgroundColor(int);
method public void setShowWeekNumber(boolean);
method public deprecated void setShowWeekNumber(boolean);
method public deprecated void setShownWeekCount(int);
method public deprecated void setUnfocusedMonthDateColor(int);
method public void setWeekDayTextAppearance(int);

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

@@ -430,9 +430,11 @@ public class CalendarView extends FrameLayout {
* Sets whether to show the week number.
*
* @param showWeekNumber True to show the week number.
* @deprecated No longer used by Material-style CalendarView.
*
* @attr ref android.R.styleable#CalendarView_showWeekNumber
*/
@Deprecated
public void setShowWeekNumber(boolean showWeekNumber) {
mDelegate.setShowWeekNumber(showWeekNumber);
}
@@ -441,9 +443,11 @@ public class CalendarView extends FrameLayout {
* Gets whether to show the week number.
*
* @return True if showing the week number.
* @deprecated No longer used by Material-style CalendarView.
*
* @attr ref android.R.styleable#CalendarView_showWeekNumber
*/
@Deprecated
public boolean getShowWeekNumber() {
return mDelegate.getShowWeekNumber();
}

2
core/java/android/widget/CalendarViewLegacyDelegate.java
View File

@@ -404,7 +404,7 @@ class CalendarViewLegacyDelegate extends CalendarView.AbstractCalendarViewDelega
@Override
public int getUnfocusedMonthDateColor() {
return mFocusedMonthDateColor;
return mUnfocusedMonthDateColor;
}
@Override