diff options
-rw-r--r-- | res/drawable-xhdpi/ic_check_circle_white_48dp.png | bin | 361 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_developer_mode_tv_white_48dp.png | bin | 552 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_error_white_48dp.png | bin | 712 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_warning_white_18dp.png | bin | 329 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_warning_white_96dp.png | bin | 976 -> 0 bytes | |||
-rw-r--r-- | src/com/android/tv/dvr/ui/DvrAlreadyRecordedFragment.java | 2 | ||||
-rw-r--r-- | src/com/android/tv/dvr/ui/DvrAlreadyScheduledFragment.java | 2 | ||||
-rw-r--r-- | src/com/android/tv/dvr/ui/DvrConflictFragment.java | 4 | ||||
-rw-r--r-- | src/com/android/tv/dvr/ui/DvrSeriesScheduledFragment.java | 4 | ||||
-rw-r--r-- | src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java | 2 | ||||
-rw-r--r-- | src/com/android/tv/guide/ProgramItemView.java | 2 | ||||
-rw-r--r-- | src/com/android/tv/menu/MenuAction.java | 2 |
12 files changed, 9 insertions, 9 deletions
diff --git a/res/drawable-xhdpi/ic_check_circle_white_48dp.png b/res/drawable-xhdpi/ic_check_circle_white_48dp.png Binary files differdeleted file mode 100644 index a1cf83e6..00000000 --- a/res/drawable-xhdpi/ic_check_circle_white_48dp.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_developer_mode_tv_white_48dp.png b/res/drawable-xhdpi/ic_developer_mode_tv_white_48dp.png Binary files differdeleted file mode 100644 index 594af851..00000000 --- a/res/drawable-xhdpi/ic_developer_mode_tv_white_48dp.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_error_white_48dp.png b/res/drawable-xhdpi/ic_error_white_48dp.png Binary files differdeleted file mode 100644 index 8c2cf1e5..00000000 --- a/res/drawable-xhdpi/ic_error_white_48dp.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_warning_white_18dp.png b/res/drawable-xhdpi/ic_warning_white_18dp.png Binary files differdeleted file mode 100644 index 13d573e1..00000000 --- a/res/drawable-xhdpi/ic_warning_white_18dp.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_warning_white_96dp.png b/res/drawable-xhdpi/ic_warning_white_96dp.png Binary files differdeleted file mode 100644 index 50d1f295..00000000 --- a/res/drawable-xhdpi/ic_warning_white_96dp.png +++ /dev/null diff --git a/src/com/android/tv/dvr/ui/DvrAlreadyRecordedFragment.java b/src/com/android/tv/dvr/ui/DvrAlreadyRecordedFragment.java index fce94230..5e3caa9c 100644 --- a/src/com/android/tv/dvr/ui/DvrAlreadyRecordedFragment.java +++ b/src/com/android/tv/dvr/ui/DvrAlreadyRecordedFragment.java @@ -71,7 +71,7 @@ public class DvrAlreadyRecordedFragment extends DvrGuidedStepFragment { public Guidance onCreateGuidance(Bundle savedInstanceState) { String title = getString(R.string.dvr_already_recorded_dialog_title); String description = getString(R.string.dvr_already_recorded_dialog_description); - Drawable image = getResources().getDrawable(R.drawable.ic_warning_white_96dp, null); + Drawable image = getResources().getDrawable(R.drawable.quantum_ic_warning_white_96, null); return new Guidance(title, description, null, image); } diff --git a/src/com/android/tv/dvr/ui/DvrAlreadyScheduledFragment.java b/src/com/android/tv/dvr/ui/DvrAlreadyScheduledFragment.java index 456ad830..a6bbe137 100644 --- a/src/com/android/tv/dvr/ui/DvrAlreadyScheduledFragment.java +++ b/src/com/android/tv/dvr/ui/DvrAlreadyScheduledFragment.java @@ -78,7 +78,7 @@ public class DvrAlreadyScheduledFragment extends DvrGuidedStepFragment { getContext(), mDuplicate.getStartTimeMs(), DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE)); - Drawable image = getResources().getDrawable(R.drawable.ic_warning_white_96dp, null); + Drawable image = getResources().getDrawable(R.drawable.quantum_ic_warning_white_96, null); return new Guidance(title, description, null, image); } diff --git a/src/com/android/tv/dvr/ui/DvrConflictFragment.java b/src/com/android/tv/dvr/ui/DvrConflictFragment.java index 65759555..649cc89a 100644 --- a/src/com/android/tv/dvr/ui/DvrConflictFragment.java +++ b/src/com/android/tv/dvr/ui/DvrConflictFragment.java @@ -205,7 +205,7 @@ public abstract class DvrConflictFragment extends DvrGuidedStepFragment { if (description == null) { dismissDialog(); } - Drawable icon = getResources().getDrawable(R.drawable.ic_error_white_48dp, null); + Drawable icon = getResources().getDrawable(R.drawable.quantum_ic_error_white_48, null); return new Guidance(title, descriptionPrefix + " " + description, null, icon); } @@ -265,7 +265,7 @@ public abstract class DvrConflictFragment extends DvrGuidedStepFragment { if (description == null) { dismissDialog(); } - Drawable icon = getResources().getDrawable(R.drawable.ic_error_white_48dp, null); + Drawable icon = getResources().getDrawable(R.drawable.quantum_ic_error_white_48, null); return new Guidance(title, descriptionPrefix + " " + description, null, icon); } diff --git a/src/com/android/tv/dvr/ui/DvrSeriesScheduledFragment.java b/src/com/android/tv/dvr/ui/DvrSeriesScheduledFragment.java index edb62c96..c6e26850 100644 --- a/src/com/android/tv/dvr/ui/DvrSeriesScheduledFragment.java +++ b/src/com/android/tv/dvr/ui/DvrSeriesScheduledFragment.java @@ -101,9 +101,9 @@ public class DvrSeriesScheduledFragment extends DvrGuidedStepFragment { String title = getString(R.string.dvr_series_recording_dialog_title); Drawable icon; if (!mHasConflict) { - icon = getResources().getDrawable(R.drawable.ic_check_circle_white_48dp, null); + icon = getResources().getDrawable(R.drawable.quantum_ic_check_circle_white_48, null); } else { - icon = getResources().getDrawable(R.drawable.ic_error_white_48dp, null); + icon = getResources().getDrawable(R.drawable.quantum_ic_error_white_48, null); } return new GuidanceStylist.Guidance(title, getDescription(), null, icon); } diff --git a/src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java b/src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java index e93387ab..1ab4c500 100644 --- a/src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java +++ b/src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java @@ -126,7 +126,7 @@ public class DvrStopRecordingFragment extends DvrGuidedStepFragment { } else { description = getString(R.string.dvr_stop_recording_dialog_description); } - Drawable image = getResources().getDrawable(R.drawable.ic_warning_white_96dp, null); + Drawable image = getResources().getDrawable(R.drawable.quantum_ic_warning_white_96, null); return new Guidance(title, description, null, image); } diff --git a/src/com/android/tv/guide/ProgramItemView.java b/src/com/android/tv/guide/ProgramItemView.java index 745695a6..a46beab7 100644 --- a/src/com/android/tv/guide/ProgramItemView.java +++ b/src/com/android/tv/guide/ProgramItemView.java @@ -371,7 +371,7 @@ public class ProgramItemView extends TextView { int iconResId = 0; if (isEntryWideEnough() && mTableEntry.scheduledRecording != null) { if (mDvrManager.isConflicting(mTableEntry.scheduledRecording)) { - iconResId = R.drawable.ic_warning_white_18dp; + iconResId = R.drawable.quantum_ic_warning_white_18; } else { switch (mTableEntry.scheduledRecording.getState()) { case ScheduledRecording.STATE_RECORDING_NOT_STARTED: diff --git a/src/com/android/tv/menu/MenuAction.java b/src/com/android/tv/menu/MenuAction.java index 24b886ad..8c180cae 100644 --- a/src/com/android/tv/menu/MenuAction.java +++ b/src/com/android/tv/menu/MenuAction.java @@ -55,7 +55,7 @@ public class MenuAction { new MenuAction( R.string.options_item_developer, TvOptionsManager.OPTION_DEVELOPER, - R.drawable.ic_developer_mode_tv_white_48dp); + R.drawable.quantum_ic_developer_mode_tv_white_48); public static final MenuAction SETTINGS_ACTION = new MenuAction( R.string.options_item_settings, |