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

Commit a9879bf1 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Linux Build Service Account
Browse files

DeskClock: User-defined world cities 



Support for add user-defined cities to the world clock

Patchset 2: Added GPS query
Patchset 3: Added GPS drawables
            Call requestGpsLocation in background
Patchset 4: Added timezone resolution through Google Api
            Added Marco suggestions
            Rebased
Patchset 5: Remove trailing whitespaces
Patchset 6: Moved cm strings to the end of the file
            Rebased
Patchset 7: Export DbCityProvider. Enforce write permission to DeskClock only
Patchset 8: Fix FC when there is no default timezone
            Add content description to GPS button
            Don't create a new city record of city name + city tz already exists
Patchset 9: Rebased
Patchset 10: Rebased (Moved string to cm_string)
Patchset 11: Cleanup
Patchset 12: Use localized time zone names
Patchset 13: Fix online timezone lookup
Patchset 14: CleanUp. Save dialog state
Patchset 15: Kill of async tasks when closing dialog

Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>

Conflicts:
	AndroidManifest.xml
	res/menu/cities_menu.xml
	res/values/cm_strings.xml
	src/com/android/deskclock/Utils.java
	src/com/android/deskclock/worldclock/CitiesActivity.java
	src/com/android/deskclock/worldclock/CityObj.java

CRs-Fixed: 1014635

Change-Id: I99de103ce18dd009846689f5f2018072fd0e91bb
parent 59d1062e

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ 
    <!-- READ_EXTERNAL_STORAGE is required to play custom ringtones from the SD card prior to M -->

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />



    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <uses-permission android:name="com.android.deskclock.worldclock.permissions.WRITE_DATABASE" />



    <application android:label="@string/app_label"

                 android:name=".DeskClockApplication"

                 android:allowBackup="true"
@@ -50,6 +56,11 @@ 
                android:exported="false"

                android:directBootAware="true" />



        <provider android:name="com.android.deskclock.worldclock.db.DbCityProvider"

                android:authorities="com.android.deskclock.worldclock.db"

                android:exported="true"

                android:writePermission="com.android.deskclock.worldclock.permissions.WRITE_DATABASE" />



        <activity android:name="DeskClock"

                android:label="@string/app_label"

                android:theme="@style/DeskClockTheme"

res/drawable-hdpi/ic_gps_disabled.png

0 → 100644
+1.53 KiB
Loading image diff...

res/drawable-hdpi/ic_gps_off.png

0 → 100644
+1.53 KiB
Loading image diff...

res/drawable-hdpi/ic_gps_on.png

0 → 100644
+1.93 KiB
Loading image diff...

res/drawable-mdpi/ic_gps_disabled.png

0 → 100644
+985 B
Loading image diff...