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

Commit 7ac9e3a1 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Greylist requested hidden API" am: 473654c3 am: 9582cf7c 

am: e10a083e

Change-Id: Ie1b9085d2766bae6e4725ae50250cdb8b5efd9c6
parents a1b1d799 e10a083e

core/java/android/widget/DatePickerSpinnerDelegate.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.widget;

package android.widget;





import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.content.res.TypedArray;
@@ -502,6 +503,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { 
                || mCurrentDate.get(Calendar.DAY_OF_MONTH) != dayOfMonth);

                || mCurrentDate.get(Calendar.DAY_OF_MONTH) != dayOfMonth);

    }

    }





    @UnsupportedAppUsage

    private void setDate(int year, int month, int dayOfMonth) {

    private void setDate(int year, int month, int dayOfMonth) {

        mCurrentDate.set(year, month, dayOfMonth);

        mCurrentDate.set(year, month, dayOfMonth);

        resetAutofilledValue();

        resetAutofilledValue();
@@ -512,6 +514,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { 
        }

        }

    }

    }





    @UnsupportedAppUsage

    private void updateSpinners() {

    private void updateSpinners() {

        // set the spinner ranges respecting the min and max dates

        // set the spinner ranges respecting the min and max dates

        if (mCurrentDate.equals(mMinDate)) {

        if (mCurrentDate.equals(mMinDate)) {
@@ -564,6 +567,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { 
    /**

    /**

     * Updates the calendar view with the current date.

     * Updates the calendar view with the current date.

     */

     */

    @UnsupportedAppUsage

    private void updateCalendarView() {

    private void updateCalendarView() {

        mCalendarView.setDate(mCurrentDate.getTimeInMillis(), false, false);

        mCalendarView.setDate(mCurrentDate.getTimeInMillis(), false, false);

    }

    }
@@ -572,6 +576,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { 
    /**

    /**

     * Notifies the listener, if such, for a change in the selected date.

     * Notifies the listener, if such, for a change in the selected date.

     */

     */

    @UnsupportedAppUsage

    private void notifyDateChanged() {

    private void notifyDateChanged() {

        mDelegator.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);

        mDelegator.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);

        if (mOnDateChangedListener != null) {

        if (mOnDateChangedListener != null) {
@@ -627,6 +632,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { 
        }

        }

    }

    }





    @UnsupportedAppUsage

    private void updateInputState() {

    private void updateInputState() {

        // Make sure that if the user changes the value and the IME is active

        // Make sure that if the user changes the value and the IME is active

        // for one of the inputs if this widget, the IME is closed. If the user

        // for one of the inputs if this widget, the IME is closed. If the user

core/java/com/android/internal/app/WindowDecorActionBar.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.AnimatorSet;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.animation.ValueAnimator;

import android.annotation.UnsupportedAppUsage;

import android.app.ActionBar;

import android.app.ActionBar;

import android.app.Activity;

import android.app.Activity;

import android.app.Dialog;

import android.app.Dialog;
@@ -79,6 +80,7 @@ public class WindowDecorActionBar extends ActionBar implements 
    private ActionBarOverlayLayout mOverlayLayout;

    private ActionBarOverlayLayout mOverlayLayout;

    private ActionBarContainer mContainerView;

    private ActionBarContainer mContainerView;

    private DecorToolbar mDecorToolbar;

    private DecorToolbar mDecorToolbar;

    @UnsupportedAppUsage

    private ActionBarContextView mContextView;

    private ActionBarContextView mContextView;

    private ActionBarContainer mSplitView;

    private ActionBarContainer mSplitView;

    private View mContentView;

    private View mContentView;