aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2016-04-14 17:19:42 -0700
committerAdnan Begovic <adnan@cyngn.com>2016-04-18 13:20:36 -0700
commit2a77ad45d9e66427f5899da32a611586e191a0c2 (patch)
tree29ea191061de9bd91d064282a80feaa81ca3dadf
parent2c397d79b9e64a0b314426c25c52db1c4e6bc607 (diff)
downloadandroid_packages_apps_WundergroundWeatherProvider-2a77ad45d9e66427f5899da32a611586e191a0c2.tar.gz
android_packages_apps_WundergroundWeatherProvider-2a77ad45d9e66427f5899da32a611586e191a0c2.tar.bz2
android_packages_apps_WundergroundWeatherProvider-2a77ad45d9e66427f5899da32a611586e191a0c2.zip
WundergroundCM: Provide attribution and do clean up.
Do legal attribution for logo and copyright usage. Change-Id: I42fe4c4e99e01ebc93ab02293c44e6b58dd8d0fd
-rw-r--r--app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WUBasePreferenceActivity.java18
-rwxr-xr-x[-rw-r--r--]app/src/main/res/mipmap-hdpi/ic_launcher.pngbin3418 -> 4386 bytes
-rwxr-xr-x[-rw-r--r--]app/src/main/res/mipmap-mdpi/ic_launcher.pngbin2206 -> 2762 bytes
-rwxr-xr-x[-rw-r--r--]app/src/main/res/mipmap-xhdpi/ic_launcher.pngbin4842 -> 6492 bytes
-rwxr-xr-x[-rw-r--r--]app/src/main/res/mipmap-xxhdpi/ic_launcher.pngbin7718 -> 10761 bytes
-rwxr-xr-xapp/src/main/res/mipmap-xxxhdpi/ic_launcher.pngbin0 -> 15849 bytes
-rw-r--r--app/src/main/res/values-v21/styles.xml2
-rw-r--r--app/src/main/res/values/strings.xml5
-rw-r--r--app/src/main/res/xml/preferences.xml8
9 files changed, 31 insertions, 2 deletions
diff --git a/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WUBasePreferenceActivity.java b/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WUBasePreferenceActivity.java
index f49f73a..1d0dd20 100644
--- a/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WUBasePreferenceActivity.java
+++ b/app/src/main/java/org/cyanogenmod/wundergroundcmweatherprovider/WUBasePreferenceActivity.java
@@ -15,6 +15,7 @@
*/
package org.cyanogenmod.wundergroundcmweatherprovider;
+import android.app.ActionBar;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
@@ -25,6 +26,8 @@ import android.preference.EditTextPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.text.Editable;
+import android.view.Menu;
+import android.view.MenuItem;
public class WUBasePreferenceActivity extends PreferenceActivity implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
@@ -47,6 +50,21 @@ public class WUBasePreferenceActivity extends PreferenceActivity implements Pref
mApiKeyPreference = (EditTextPreference) findPreference(API_KEY_KEY);
mApiKeyPreference.setOnPreferenceChangeListener(this);
mCreateAccountPreference.setOnPreferenceClickListener(this);
+
+ ActionBar actionBar = getActionBar();
+ if (actionBar != null) {
+ actionBar.setDisplayHomeAsUpEnabled(true);
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ finish();
+ break;
+ }
+ return super.onOptionsItemSelected(item);
}
@Override
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index cde69bc..4d30fb4 100644..100755
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c133a0c..e1d938a 100644..100755
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index bfa42f0..50315cf 100644..100755
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 324e72c..7634b38 100644..100755
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..fe8cae9
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index ba5d926..0476ecd 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -12,6 +12,6 @@
limitations under the License.
-->
<resources>
- <style name="AppTheme" parent="android:Theme.Material.Light">
+ <style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
</style>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c11c699..ba0220c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,7 +11,7 @@
limitations under the License.
-->
<resources>
- <string name="app_name">Weather Underground CM Provider</string>
+ <string name="app_name">Weather Underground</string>
<string name="action_settings">Settings</string>
<string name="authentication_preference_category_title">Authentication</string>
@@ -19,4 +19,7 @@
<string name="authentication_preference_api_key_summary">API key to be utilized for Weather Underground authentication</string>
<string name="authentication_preference_account_create">Create account</string>
<string name="authentication_preference_account_create_summary">Create an account to get an API key for weather data usage</string>
+ <string name="about_preference_category_title">About</string>
+ <string name="about_preference">Copyright</string>
+ <string name="about_preference_summary">Weather Underground is a registered trademark of The Weather Channel, LLC. both in the United States and internationally. The Weather Underground Logo is a trademark of Weather Underground, LLC.</string>
</resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 3f2ce3c..1519bbb 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -23,4 +23,12 @@
android:summary="@string/authentication_preference_api_key_summary"/>
</PreferenceCategory>
+ <PreferenceCategory
+ android:title="@string/about_preference_category_title">
+ <Preference
+ android:title="@string/about_preference"
+ android:summary="@string/about_preference_summary"
+ android:icon="@mipmap/ic_launcher"/>
+ </PreferenceCategory>
+
</PreferenceScreen> \ No newline at end of file