diff options
| author | 2017-05-15 15:24:16 -0700 | |
|---|---|---|
| committer | 2017-05-15 15:39:28 -0700 | |
| commit | c0aa90d9ee66837ae3d36e4f97c8645b3f0053be (patch) | |
| tree | 022ec84320228f0f6352df3345f0eb5438422e51 | |
| parent | 81a57133e8fd1b5d3bf018e2721f71f7197e94c6 (diff) | |
Update TimePicker mode switch icon.
Previously the icon was an event icon, but a clock icon is
more appropriate so we are switching to that instead.
Bug: 37351390
Test: Open time picker
Change-Id: I47e6caf3c341c10264168004628288fd00e4601a
| -rw-r--r-- | core/java/android/widget/TimePickerClockDelegate.java | 2 | ||||
| -rw-r--r-- | core/res/res/drawable/btn_clock_material.xml (renamed from core/res/res/drawable/btn_event_material.xml) | 11 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java index 3605585fe605..05d0f960131f 100644 --- a/core/java/android/widget/TimePickerClockDelegate.java +++ b/core/java/android/widget/TimePickerClockDelegate.java @@ -248,7 +248,7 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate { mRadialTimePickerHeader.setVisibility(View.GONE); mTextInputPickerHeader.setVisibility(View.VISIBLE); mTextInputPickerView.setVisibility(View.VISIBLE); - mRadialTimePickerModeButton.setImageResource(R.drawable.btn_event_material); + mRadialTimePickerModeButton.setImageResource(R.drawable.btn_clock_material); mRadialTimePickerModeButton.setContentDescription( mRadialTimePickerModeEnabledDescription); mRadialPickerModeEnabled = false; diff --git a/core/res/res/drawable/btn_event_material.xml b/core/res/res/drawable/btn_clock_material.xml index 47c49cf2fa8c..f785ebf7a881 100644 --- a/core/res/res/drawable/btn_event_material.xml +++ b/core/res/res/drawable/btn_clock_material.xml @@ -18,12 +18,9 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - + android:viewportWidth="24.0" + android:viewportHeight="24.0"> <path android:fillColor="#90ffffff" - android:pathData="M17 12h-5v5h5v-5zM16 1v2H8V1H6v2H5c-1.11 0-1.99 .9 -1.99 2L3 19c0 1.1 .89 2 2 -2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2h-1V1h-2zm3 18H5V8h14v11z" /> - <path android:pathData="M0 0h24v24H0z" /> -</vector>
\ No newline at end of file + android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/> +</vector> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 31d13c941a9f..fd78ab43b6cb 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2932,7 +2932,7 @@ <java-symbol type="id" name="label_error"/> <java-symbol type="layout" name="time_picker_text_input_material"/> <java-symbol type="drawable" name="btn_keyboard_key_material"/> - <java-symbol type="drawable" name="btn_event_material"/> + <java-symbol type="drawable" name="btn_clock_material"/> <java-symbol type="string" name="time_picker_text_input_mode_description"/> <java-symbol type="string" name="time_picker_radial_mode_description"/> |