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

Commit c2e75685 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Revert first-day-of-week changes 

This is the wrong approach, there's already code in place for it but
it is user-input driven (explicit "First day of week" option). If set
to something other than Sunday, these changes make everything shift
twice as much :(

Revert "alarms: Fix the labels on repeat days"

This reverts commit 19b0da1c.

Revert "deskclock: internationalize repeat days layout"

This reverts commit 474327d7.

More CYNGNOS-1822

Change-Id: I9980d9dc7bc7403808a2120404831c5d43f2a403
parent 19b0da1c

src/com/android/deskclock/AlarmClockFragment.java

+10 −12
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ import com.android.deskclock.widget.TextTime; 


import java.util.Calendar;

import java.util.HashSet;

import java.util.Locale;

import java.util.UUID;



import cyanogenmod.app.Profile;
@@ -626,8 +625,16 @@ public abstract class AlarmClockFragment extends DeskClockFragment implements 
        // Determines the order that days of the week are shown in the UI

        private int[] mDayOrder;



        // The array is filled when the adapter is created

        private final int[] DAY_ORDER = new int[7];

        // A reference used to create mDayOrder

        private final int[] DAY_ORDER = new int[] {

                Calendar.SUNDAY,

                Calendar.MONDAY,

                Calendar.TUESDAY,

                Calendar.WEDNESDAY,

                Calendar.THURSDAY,

                Calendar.FRIDAY,

                Calendar.SATURDAY,

        };



        public class ItemHolder {
@@ -680,15 +687,6 @@ public abstract class AlarmClockFragment extends DeskClockFragment implements 
            mFactory = LayoutInflater.from(context);

            mList = list;



            int firstDayOfWeek = Calendar.getInstance(Locale.getDefault()).getFirstDayOfWeek();

            int j = 0;

            for (int i = firstDayOfWeek; i <= DAY_ORDER.length; i++, j++) {

                DAY_ORDER[j] = i;

            }

            for (int i = Calendar.SUNDAY; i < firstDayOfWeek; i++, j++) {

                DAY_ORDER[j] = i;

            }



            Resources res = mContext.getResources();



            mRobotoNormal = Typeface.create("sans-serif", Typeface.NORMAL);

src/com/android/deskclock/Utils.java

+1 −5
Original line number Diff line number Diff line
@@ -777,15 +777,11 @@ public class Utils { 
        final SimpleDateFormat shortFormat = new SimpleDateFormat(DATE_FORMAT_SHORT);

        final SimpleDateFormat longFormat = new SimpleDateFormat(DATE_FORMAT_LONG);



        final int firstDayOfWeek = Calendar.getInstance(Locale.getDefault()).getFirstDayOfWeek();

        final int dayOfWeekOffset = firstDayOfWeek - Calendar.SUNDAY;



        // Create a date (2014/07/20) that is a Sunday

        final long aSunday = new GregorianCalendar(2014, Calendar.JULY, 20).getTimeInMillis();





        for (int i = 0; i < DaysOfWeek.DAYS_IN_A_WEEK; i++) {

            final long dayMillis = aSunday + ( i + dayOfWeekOffset ) * DateUtils.DAY_IN_MILLIS;

            final long dayMillis = aSunday + i * DateUtils.DAY_IN_MILLIS;

            sShortWeekdays[i] = shortFormat.format(new Date(dayMillis));

            sLongWeekdays[i] = longFormat.format(new Date(dayMillis));

        }