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

Commit 2f40785d authored by Itzhak Katzenelson's avatar Itzhak Katzenelson Committed by Isaac Katzenelson
Browse files

Updated cities list for world clock 

Bug: 7265721
Change-Id: Iac20e17c207df486bde2d6682ed62abc65917061
parent b8692eb7

res/values/array.xml

+813 −1536

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/deskclock/ClockFragment.java

+10 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.animation.AnimationUtils;

import android.widget.BaseAdapter;

import android.widget.LinearLayout;

import android.widget.ListView;

import android.widget.TextView;
@@ -193,19 +192,22 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen 


        public WorldClockAdapter(Context context) {

            super();

            mCitiesList = Cities.readCitiesFromSharedPrefs(

                    PreferenceManager.getDefaultSharedPreferences(context)).values().toArray();

            mContext = context;

            mCitiesList = addHomeCity();

            loadData(context);

            mInflater = LayoutInflater.from(context);

            set24HoursMode(context);

        }



        public void reloadData(Context context) {

            loadData(context);

            notifyDataSetChanged();

        }



        private void loadData(Context context) {

            mCitiesList = Cities.readCitiesFromSharedPrefs(

                    PreferenceManager.getDefaultSharedPreferences(context)).values().toArray();

            sortList();

            mCitiesList = addHomeCity();

            notifyDataSetChanged();

        }



        /***
@@ -231,6 +233,9 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen 
            return mCitiesList;

        }



        private void sortList() {

        }



        @Override

        public int getCount() {

            // Each item in the list holds 1 or 2 clocks

src/com/android/deskclock/worldclock/CityObj.java

+0 −9
Original line number Diff line number Diff line
@@ -17,18 +17,9 @@ 
package com.android.deskclock.worldclock;



import android.content.SharedPreferences;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.Log;

import android.view.View;



import java.util.ArrayList;

import java.util.HashSet;

import java.util.Set;



public class CityObj {



    private static final String TAG = "CityObj";

    private static final String CITY_NAME = "city_name_";

    private static final String CITY_TIME_ZONE = "city_tz_";

    private static final String CITY_ID = "city_id_";