diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e4d5d4a..9c6db40 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="1.5" > +

Notices for library:

+ +
+/*
+ * Copyright (C) 2013 Umano
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ + +

Notices for library:

+
+/*
+ * Copyright (C) 2012 Carl Bauer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ + +

Notices for file:

+
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 1ac7a7e..d484d2c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -137,12 +137,15 @@ Original Apollo Source Code: \n https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1 ]]> + Dependency Licenses + Dependency Licenses: themepreview themePackageName themePrefences build_version + build_depends tabs_enabled visualization_type widget_type diff --git a/res/xml/settings.xml b/res/xml/settings.xml index b313d2c..904cb18 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -47,6 +47,9 @@ android:key="@string/key_build_version" android:summary="@string/app_version_number" android:title="@string/version" /> + \ No newline at end of file diff --git a/src/com/andrew/apolloMod/Constants.java b/src/com/andrew/apolloMod/Constants.java index 8a15888..80f6266 100644 --- a/src/com/andrew/apolloMod/Constants.java +++ b/src/com/andrew/apolloMod/Constants.java @@ -15,7 +15,7 @@ public final class Constants { // SharedPreferences public final static String APOLLO = "Apollo", APOLLO_PREFERENCES = "apollopreferences", ARTIST_KEY = "artist", ALBUM_KEY = "album", ALBUM_ID_KEY = "albumid", NUMALBUMS = "num_albums", - GENRE_KEY = "genres", ARTIST_ID = "artistid", NUMWEEKS = "numweeks", + GENRE_KEY = "genres", ARTIST_ID = "artistid", NUMWEEKS = "numweeks",BUILD_DEPENDS = "build_depends", PLAYLIST_NAME_FAVORITES = "Favorites", PLAYLIST_NAME = "playlist", WIDGET_STYLE="widget_type", VISUALIZATION_TYPE="visualization_type", DELETE_CACHE="delete_cache", BUILD_VERSION = "build_version", UP_STARTS_ALBUM_ACTIVITY = "upStartsAlbumActivity", TABS_ENABLED = "tabs_enabled"; diff --git a/src/com/andrew/apolloMod/preferences/SettingsHolder.java b/src/com/andrew/apolloMod/preferences/SettingsHolder.java index f7c5003..1b868ac 100644 --- a/src/com/andrew/apolloMod/preferences/SettingsHolder.java +++ b/src/com/andrew/apolloMod/preferences/SettingsHolder.java @@ -23,6 +23,7 @@ import android.text.method.LinkMovementMethod; import android.text.util.Linkify; import android.view.MenuItem; +import android.webkit.WebView; import android.widget.TextView; import com.andrew.apolloMod.IApolloService; @@ -35,10 +36,8 @@ import static com.andrew.apolloMod.Constants.WIDGET_STYLE; import static com.andrew.apolloMod.Constants.DELETE_CACHE; import static com.andrew.apolloMod.Constants.BUILD_VERSION; -/** - * @author Andrew Neal FIXME - Work on the IllegalStateException thrown when - * using PreferenceFragment and theme chooser - */ +import static com.andrew.apolloMod.Constants.BUILD_DEPENDS; + @SuppressWarnings("deprecation") public class SettingsHolder extends PreferenceActivity implements ServiceConnection { Context mContext; @@ -63,6 +62,8 @@ protected void onCreate(Bundle savedInstanceState) { // Init about dialog initAboutDialog(); + initDependencies(); + } @Override @@ -128,6 +129,25 @@ public boolean onPreferenceClick(final Preference preference) { }); } + + private void initDependencies(){ + final Preference buildDepend = findPreference(BUILD_DEPENDS); + buildDepend.setOnPreferenceClickListener(new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(final Preference preference) { + + final WebView webView = new WebView(mContext); + webView.loadUrl("file:///android_asset/licenses.html"); + new AlertDialog.Builder(mContext) + .setTitle(R.string.dependencies_title) + .setView(webView) + .setPositiveButton(android.R.string.ok, null) + .create() + .show(); + return true; + } + }); + } /** * Removes all of the cache entries. */