ESPRESSO-823: Removed TimePicker themeability. (6499d419) · Commits · e / os / android_frameworks_base

core/java/android/app/TimePickerDialog.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -73,7 +73,8 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
		public TimePickerDialog(Context context,
		OnTimeSetListener callBack,
		int hourOfDay, int minute, boolean is24HourView) {
		this(context, 0, callBack, hourOfDay, minute, is24HourView);
		this(context, com.android.internal.R.style.Theme_Dialog_Alert,
		callBack, hourOfDay, minute, is24HourView);
		}

		/**
		@@ -94,7 +95,7 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
		mInitialMinute = minute;
		mIs24HourView = is24HourView;

		mDateFormat = DateFormat.getTimeFormat(getContext());
		mDateFormat = DateFormat.getTimeFormat(context);
		mCalendar = Calendar.getInstance();
		updateTitle(mInitialHourOfDay, mInitialMinute);

		@@ -103,7 +104,7 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
		setIcon(R.drawable.ic_dialog_time);

		LayoutInflater inflater =
		(LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
		(LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
		View view = inflater.inflate(R.layout.time_picker_dialog, null);
		setView(view);
		mTimePicker = (TimePicker) view.findViewById(R.id.timePicker);

+7 −4

Original line number	Diff line number	Diff line
		@@ -22,18 +22,21 @@
		<com.android.internal.widget.NumberPickerButton android:id="@+id/increment"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="?android:attr/buttonStyleTimePickerUp" />
		android:background="@drawable/timepicker_up_btn" />

		<EditText android:id="@+id/timepicker_input"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:gravity="center"
		android:singleLine="true"
		style="?android:attr/timePickerInputStyle"
		/>
		style="?android:attr/textAppearanceLargeInverse"
		android:textColor="@android:color/primary_text_light"
		android:textSize="30sp"
		android:background="@drawable/timepicker_input" />

		<com.android.internal.widget.NumberPickerButton android:id="@+id/decrement"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		style="?android:attr/buttonStyleTimePickerDown" />
		android:background="@drawable/timepicker_down_btn" />

		</merge>

+0 −6

Original line number	Diff line number	Diff line
		@@ -154,10 +154,6 @@
		<!-- ToggleButton style. -->
		<attr name="buttonStyleToggle" format="reference" />

		<!-- TimePicker Button styles. -->
		<attr name="buttonStyleTimePickerUp" format="reference" />
		<attr name="buttonStyleTimePickerDown" format="reference" />

		<!-- ============== -->
		<!-- Gallery styles -->
		<!-- ============== -->
		@@ -359,8 +355,6 @@
		<attr name="dropDownListViewStyle" format="reference" />
		<!-- Default EditText style. -->
		<attr name="editTextStyle" format="reference" />
		<!-- Default TimePicker Input style. -->
		<attr name="timePickerInputStyle" format="reference" />
		<!-- Default ExpandableListView style. -->
		<attr name="expandableListViewStyle" format="reference" />
		<!-- Default Gallery style. -->

+1 −7

Original line number	Diff line number	Diff line
		@@ -1225,16 +1225,13 @@
		=============================================================== -->
		<eat-comment />

		<public type="style" name="Widget.EditText.TimePicker" id="0x010300a0" />
		<public type="style" name="com_android_server_status_ExpandedView" />
		<public type="style" name="com_android_server_status_ExpandedView" id="0x010300a0" />
		<public type="style" name="com_android_server_status_LatestItemView" />
		<public type="style" name="Widget.TextView.ListItem" />
		<public type="style" name="Widget.TextView.ListItem.White" />
		<public type="style" name="Widget.ExpandableListView.White" />
		<public type="style" name="Widget.ExpandableListView.Dialog" />
		<public type="style" name="Widget.ListView.Dialog" />
		<public type="style" name="TimePickerUpButton" />
		<public type="style" name="TimePickerDownButton" />

		<public type="attr" name="listItemBackground" id="0x010102c1" />

		@@ -1243,9 +1240,6 @@
		<public type="attr" name="searchDialogTheme" />
		<public type="attr" name="listItemTextViewStyle" />

		<public type="attr" name="timePickerInputStyle" />
		<public type="attr" name="buttonStyleTimePickerUp" />
		<public type="attr" name="buttonStyleTimePickerDown" />
		<public type="attr" name="menuItemBackground" />
		<public type="attr" name="expandedMenuTheme" />
		<public type="attr" name="iconMenuTheme" />

+0 −15

Original line number	Diff line number	Diff line
		@@ -845,13 +845,6 @@
		<item name="android:textColor">@android:color/primary_text_light</item>
		</style>

		<style name="Widget.EditText.TimePicker">
		<item name="android:background">@android:drawable/timepicker_input</item>
		<item name="android:textAppearance">?android:attr/textAppearanceLargeInverse</item>
		<item name="android:gravity">center</item>
		<item name="android:textSize">30sp</item>
		</style>

		<style name="Widget.ExpandableListView.White" parent="Widget.ListView.White">
		<item name="android:groupIndicator">@android:drawable/expander_group</item>
		<item name="android:indicatorLeft">?android:attr/expandableListPreferredItemIndicatorLeft</item>
		@@ -870,12 +863,4 @@
		<item name="textColorSecondaryInverse">@android:color/secondary_text_dark</item>
		<item name="textColorTertiaryInverse">@android:color/tertiary_text_dark</item>
		</style>

		<style name="TimePickerUpButton">
		<item name="android:background">@android:drawable/timepicker_up_btn</item>
		</style>

		<style name="TimePickerDownButton">
		<item name="android:background">@android:drawable/timepicker_down_btn</item>
		</style>
		</resources>