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

Commit a8dc3d42 authored by Kirill Grouchnikov's avatar Kirill Grouchnikov Committed by android-build-merger
Browse files

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

am: 12454dca

* commit '12454dca':
  Return correct unfocused month date color for pre-Material themes.

Change-Id: Ia26c44ef5ce30f52149a5781c363865a41dbe9e2
parents 65657590 12454dca

api/current.txt

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

























api/system-current.txt



+4
−4






























Original line number
Diff line number
Diff line








@@ -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);

























api/test-current.txt



+4
−4






























Original line number
Diff line number
Diff line








@@ -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);

























core/java/android/widget/CalendarView.java



+4
−0






























Original line number
Diff line number
Diff line








@@ -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();















    }

































core/java/android/widget/CalendarViewLegacyDelegate.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -404,7 +404,7 @@ class CalendarViewLegacyDelegate extends CalendarView.AbstractCalendarViewDelega





























    @Override















    public int getUnfocusedMonthDateColor() {













        return mFocusedMonthDateColor;













        return mUnfocusedMonthDateColor;















    }































    @Override