OmniControl: add top level grid for full screen weather activity
and remove settings launcher from app list
provider settings can easily be opened from the
full screen activity
Change-Id: I0fe829ec2d12265e8add681868e83f072e1c04df
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c4f3df4..91ee7d1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -19,6 +19,7 @@
<entry key="app/src/main/res/drawable/ic_settings_omnigears.xml" value="0.3098958333333333" />
<entry key="app/src/main/res/drawable/ic_system_update.xml" value="0.2786458333333333" />
<entry key="app/src/main/res/drawable/ic_wallpaper.xml" value="0.3098958333333333" />
+ <entry key="app/src/main/res/drawable/ic_weather.xml" value="0.5051282051282051" />
<entry key="app/src/main/res/drawable/settings_icon.xml" value="0.30885416666666665" />
<entry key="app/src/main/res/layout/grid_fragment.xml" value="0.3020833333333333" />
<entry key="app/src/main/res/layout/grid_item.xml" value="0.29270833333333335" />
diff --git a/app/src/main/java/org/omnirom/control/AppListFragment.kt b/app/src/main/java/org/omnirom/control/AppListFragment.kt
index c2abc9f..5764d21 100644
--- a/app/src/main/java/org/omnirom/control/AppListFragment.kt
+++ b/app/src/main/java/org/omnirom/control/AppListFragment.kt
@@ -61,12 +61,12 @@
resources.getString(R.string.changelog_summary)
)
- appManager.addApp(
+ /*appManager.addApp(
"org.omnirom.omnijaws",
"org.omnirom.omnijaws.SettingsActivity",
resources.getString(R.string.weather_config_title),
resources.getString(R.string.weather_config_summary)
- )
+ )*/
appManager.addApp(
"org.omnirom.logcat",
diff --git a/app/src/main/java/org/omnirom/control/GridViewFragment.kt b/app/src/main/java/org/omnirom/control/GridViewFragment.kt
index 3150e75..33cd6b2 100644
--- a/app/src/main/java/org/omnirom/control/GridViewFragment.kt
+++ b/app/src/main/java/org/omnirom/control/GridViewFragment.kt
@@ -153,6 +153,21 @@
)
)
}
+ if (Utils.isAvailableApp(requireContext(), "org.omnirom.omnijaws")) {
+ val wallpaperIntent = Intent()
+ wallpaperIntent.component = ComponentName(
+ "org.omnirom.omnijaws",
+ "org.omnirom.omnijaws.WeatherActivity"
+ )
+ gridItems.add(
+ IntentGridItem(
+ R.string.weather_current_title,
+ R.string.weather_current_summary,
+ R.drawable.ic_weather,
+ wallpaperIntent
+ )
+ )
+ }
gridItems.add(
FragmentGridItem(
R.string.more_settings_title,
diff --git a/app/src/main/res/drawable/ic_weather.xml b/app/src/main/res/drawable/ic_weather.xml
new file mode 100644
index 0000000..753064a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_weather.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="?android:textColorPrimary"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M12.74,5.47C15.1,6.5 16.35,9.03 15.92,11.46C17.19,12.56 18,14.19 18,16V16.17C18.31,16.06 18.65,16 19,16A3,3 0 0,1 22,19A3,3 0 0,1 19,22H6A4,4 0 0,1 2,18A4,4 0 0,1 6,14H6.27C5,12.45 4.6,10.24 5.5,8.26C6.72,5.5 9.97,4.24 12.74,5.47M11.93,7.3C10.16,6.5 8.09,7.31 7.31,9.07C6.85,10.09 6.93,11.22 7.41,12.13C8.5,10.83 10.16,10 12,10C12.7,10 13.38,10.12 14,10.34C13.94,9.06 13.18,7.86 11.93,7.3M13.55,3.64C13,3.4 12.45,3.23 11.88,3.12L14.37,1.82L15.27,4.71C14.76,4.29 14.19,3.93 13.55,3.64M6.09,4.44C5.6,4.79 5.17,5.19 4.8,5.63L4.91,2.82L7.87,3.5C7.25,3.71 6.65,4.03 6.09,4.44M18,9.71C17.91,9.12 17.78,8.55 17.59,8L19.97,9.5L17.92,11.73C18.03,11.08 18.05,10.4 18,9.71M3.04,11.3C3.11,11.9 3.24,12.47 3.43,13L1.06,11.5L3.1,9.28C3,9.93 2.97,10.61 3.04,11.3M19,18H16V16A4,4 0 0,0 12,12A4,4 0 0,0 8,16H6A2,2 0 0,0 4,18A2,2 0 0,0 6,20H19A1,1 0 0,0 20,19A1,1 0 0,0 19,18Z" />
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2730eea..fa55f7c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,8 +2,8 @@
<string name="app_name">Control Center</string>
<string name="app_title">OmniROM Control Center</string>
- <string name="weather_config_title">Weather service</string>
- <string name="weather_config_summary">System service settings</string>
+ <string name="weather_config_title">Weather provider</string>
+ <string name="weather_config_summary">Configure provider settings</string>
<string name="omni_remote_title">OmniRemote</string>
<string name="omni_remote_summary">VNC server to allow remote connection to device</string>
<string name="matlog_title">MatLog</string>
@@ -18,6 +18,8 @@
<string name="wallpaper_summary">Browse OmniROM themed wallpapers</string>
<string name="applist_title">Applications</string>
<string name="settings_title">Settings</string>
+ <string name="weather_current_title">Current weather</string>
+ <string name="weather_current_summary">Show current weather and configure provider</string>
<string name="bars_settings_title">Bars</string>
<string name="bars_settings_summary">Status bar options</string>
diff --git a/app/src/main/res/xml/lockscreen_settings_preferences.xml b/app/src/main/res/xml/lockscreen_settings_preferences.xml
index 972cf56..7061a2d 100644
--- a/app/src/main/res/xml/lockscreen_settings_preferences.xml
+++ b/app/src/main/res/xml/lockscreen_settings_preferences.xml
@@ -20,7 +20,7 @@
android:summary="@string/lockscreen_weather_enabled_info">
<intent
android:action="android.intent.action.MAIN"
- android:targetClass="org.omnirom.omnijaws.SettingsActivityService"
+ android:targetClass="org.omnirom.omnijaws.SettingsActivity"
android:targetPackage="org.omnirom.omnijaws" />
</Preference>