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

Commit 9e780c66 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Bug 3191746. atePicker TimePicker: Dark theme is used in a Light theme app"

parents fb461560 bf80562d

core/java/android/app/AlertDialog.java

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.database.Cursor; 
import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.Message;

import android.util.Log;

import android.util.TypedValue;

import android.view.ContextThemeWrapper;

import android.view.KeyEvent;

core/java/android/app/DatePickerDialog.java

+1 −4
Original line number Diff line number Diff line
@@ -71,10 +71,7 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener, 
            int year,

            int monthOfYear,

            int dayOfMonth) {

        this(context, context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB

                        ? com.android.internal.R.style.Theme_Holo_Dialog_Alert

                        : com.android.internal.R.style.Theme_Dialog_Alert,

                callBack, year, monthOfYear, dayOfMonth);

        this(context, 0, callBack, year, monthOfYear, dayOfMonth);

    }



    /**

core/java/android/app/TimePickerDialog.java

+1 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import com.android.internal.R; 
import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface.OnClickListener;

import android.os.Build;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;
@@ -72,11 +71,7 @@ public class TimePickerDialog extends AlertDialog 
    public TimePickerDialog(Context context,

            OnTimeSetListener callBack,

            int hourOfDay, int minute, boolean is24HourView) {

        this(context,

                context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB

                        ? com.android.internal.R.style.Theme_Holo_Dialog_Alert

                        : com.android.internal.R.style.Theme_Dialog_Alert,

                callBack, hourOfDay, minute, is24HourView);

        this(context, 0, callBack, hourOfDay, minute, is24HourView);

    }



    /**

core/java/android/widget/NumberPicker.java

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ public class NumberPicker extends LinearLayout { 
        });



        // create the fling and adjust scrollers

        mFlingScroller = new Scroller(getContext());

        mFlingScroller = new Scroller(getContext(), null, true);

        mAdjustScroller = new Scroller(getContext(), new OvershootInterpolator());



        updateInputTextView();