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

Commit 610e71f5 authored by Budi Kusmiantoro's avatar Budi Kusmiantoro Committed by Android (Google) Code Review
Browse files

Merge "Adjust font-size for digital clock AM/PM" into lmp-dev

parents 3a0d350d 577479b8

res/values-sw600dp-land/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
    <dimen name="digital_world_clock_text_size">75dp</dimen>

    <dimen name="digital_world_clock_ampm_text_size">14dp</dimen>

    <dimen name="digital_main_clock_text_size">165dp</dimen>

    <dimen name="main_ampm_font_size">25sp</dimen>



    <dimen name="timer_circle_diameter">360dip</dimen>

    <dimen name="timer_circle_width">380dip</dimen>

res/values-sw600dp/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
    <dimen name="label_font_size">18sp</dimen>

    <dimen name="alarm_label_size">18sp</dimen>

    <dimen name="body_font_size">20sp</dimen>

    <dimen name="main_ampm_font_size">33sp</dimen>

    <dimen name="alarm_time_font_size">64sp</dimen>

    <dimen name="no_alarms_font_size">48sp</dimen>

    <dimen name="widget_label_font_size">16sp</dimen>

res/values-sw720dp-land/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -32,6 +32,5 @@ 
    <dimen name="digital_world_clock_text_size">100dp</dimen>

    <dimen name="digital_world_clock_ampm_text_size">18dp</dimen>

    <dimen name="digital_main_clock_text_size">220dp</dimen>

    <dimen name="main_ampm_font_size">33sp</dimen>



</resources>

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
    <dimen name="medium_font_size">60dp</dimen>

    <dimen name="label_font_size">16sp</dimen>

    <dimen name="widget_label_font_size">14sp</dimen>

    <dimen name="main_ampm_font_size">18sp</dimen>

    <dimen name="main_ampm_font_size">32sp</dimen>

    <dimen name="header_font_size">24sp</dimen>

    <dimen name="body_font_size">18sp</dimen>

    <dimen name="alarm_time_font_size">64sp</dimen>

src/com/android/deskclock/ClockFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen 
                            Utils.setTimeFormat(

                                   (TextClock)(mDigitalClock.findViewById(R.id.digital_clock)),

                                   (int)context.getResources().

                                           getDimension(R.dimen.bottom_text_size));

                                           getDimension(R.dimen.main_ampm_font_size));

                        }

                        mAdapter.loadCitiesDb(context);

                        mAdapter.notifyDataSetChanged();
@@ -189,7 +189,7 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen 
        mDigitalClock = mClockFrame.findViewById(R.id.digital_clock);

        mAnalogClock = mClockFrame.findViewById(R.id.analog_clock);

        Utils.setTimeFormat((TextClock)(mDigitalClock.findViewById(R.id.digital_clock)),

                (int)getResources().getDimension(R.dimen.bottom_text_size));

                (int)getResources().getDimension(R.dimen.main_ampm_font_size));

        View footerView = inflater.inflate(R.layout.blank_footer_view, mList, false);

        mList.addFooterView(footerView, null, false);

        mAdapter = new WorldClockAdapter(getActivity());