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

Commit 3ff9b307 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by android-build-merger
Browse files

Merge "Update TimePicker mode switch icon." into oc-dev 

am: 1812e446

Change-Id: I8289ec34bef3f03a0fac671208e7257b547e49e1
parents 8adfc2ca 1812e446

core/java/android/widget/TimePickerClockDelegate.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -248,7 +248,7 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate { 
            mRadialTimePickerHeader.setVisibility(View.GONE);

            mRadialTimePickerHeader.setVisibility(View.GONE);

            mTextInputPickerHeader.setVisibility(View.VISIBLE);

            mTextInputPickerHeader.setVisibility(View.VISIBLE);

            mTextInputPickerView.setVisibility(View.VISIBLE);

            mTextInputPickerView.setVisibility(View.VISIBLE);

            mRadialTimePickerModeButton.setImageResource(R.drawable.btn_event_material);

            mRadialTimePickerModeButton.setImageResource(R.drawable.btn_clock_material);

            mRadialTimePickerModeButton.setContentDescription(

            mRadialTimePickerModeButton.setContentDescription(

                    mRadialTimePickerModeEnabledDescription);

                    mRadialTimePickerModeEnabledDescription);

            mRadialPickerModeEnabled = false;

            mRadialPickerModeEnabled = false;

core/res/res/drawable/btn_event_material.xml→core/res/res/drawable/btn_clock_material.xml

+4 −7
Original line number Original line Diff line number Diff line
@@ -18,12 +18,9 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:width="24dp"

        android:height="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportWidth="24.0"

        android:viewportHeight="24">

        android:viewportHeight="24.0">



    <path

    <path

        android:fillColor="#90ffffff"

        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

        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"/>

2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2h-1V1h-2zm3 18H5V8h14v11z" />

    <path android:pathData="M0 0h24v24H0z" />

</vector>
 
</vector>

core/res/res/values/symbols.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -2942,7 +2942,7 @@ 
  <java-symbol type="id" name="label_error"/>

  <java-symbol type="id" name="label_error"/>

  <java-symbol type="layout" name="time_picker_text_input_material"/>

  <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_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_text_input_mode_description"/>

  <java-symbol type="string" name="time_picker_radial_mode_description"/>

  <java-symbol type="string" name="time_picker_radial_mode_description"/>