From 14ee60eb6e089dafd8fc01c3e9f43bb3579e7dd1 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Fri, 20 Feb 2015 16:20:10 +0100
Subject: [PATCH] New widget provider info

---
 android-app/src/main/AndroidManifest.xml      |  2 +-
 .../org/solovyev/android/calculator/App.java  | 14 ++++++--
 .../src/main/res/xml/calculator_widget.xml    | 36 +++++++++++++++++++
 .../main/res/xml/calculator_widget_info.xml   | 14 ++++----
 .../res/xml/calculator_widget_info_3x3.xml    | 12 +++----
 .../res/xml/calculator_widget_info_3x4.xml    | 12 +++----
 .../res/xml/calculator_widget_info_4x4.xml    | 16 +++++----
 .../res/xml/calculator_widget_info_4x5.xml    | 14 ++++----
 8 files changed, 82 insertions(+), 38 deletions(-)
 create mode 100644 android-app/src/main/res/xml/calculator_widget.xml

diff --git a/android-app/src/main/AndroidManifest.xml b/android-app/src/main/AndroidManifest.xml
index 3431bffb..9068e9f7 100644
--- a/android-app/src/main/AndroidManifest.xml
+++ b/android-app/src/main/AndroidManifest.xml
@@ -122,7 +122,7 @@
 				<action android:name="org.solovyev.android.calculator.BUTTON_PRESSED"/>
 			</intent-filter>
 
-			<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info"/>
+			<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget"/>
 		</receiver>
 
 		<receiver android:icon="@drawable/ic_launcher" android:label="@string/c_app_widget_3x3_name" android:name=".widget.CalculatorWidgetProvider">
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/App.java b/android-app/src/main/java/org/solovyev/android/calculator/App.java
index a708d000..eb63faf9 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/App.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/App.java
@@ -169,8 +169,18 @@ public final class App {
 			App.screenMetrics = new ScreenMetrics(application);
 
 			final List<Class<? extends AppWidgetProvider>> oldNotUsedWidgetClasses = findNotUsedWidgets(application);
-			for (Class<? extends AppWidgetProvider> oldNotUsedWidgetClass : oldNotUsedWidgetClasses) {
-				Android.enableComponent(application, oldNotUsedWidgetClass, false);
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1) {
+				for (Class<? extends AppWidgetProvider> oldNotUsedWidgetClass : oldNotUsedWidgetClasses) {
+					Android.enableComponent(application, oldNotUsedWidgetClass, false);
+				}
+			} else {
+				// smaller widgets should be still used for smaller screens
+				if (oldNotUsedWidgetClasses.contains(CalculatorWidgetProvider4x5.class)) {
+					Android.enableComponent(application, CalculatorWidgetProvider4x5.class, false);
+				}
+				if (oldNotUsedWidgetClasses.contains(CalculatorWidgetProvider4x4.class)) {
+					Android.enableComponent(application, CalculatorWidgetProvider4x4.class, false);
+				}
 			}
 
 			App.initialized = true;
diff --git a/android-app/src/main/res/xml/calculator_widget.xml b/android-app/src/main/res/xml/calculator_widget.xml
new file mode 100644
index 00000000..a0f72dc1
--- /dev/null
+++ b/android-app/src/main/res/xml/calculator_widget.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ 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.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
+					xmlns:tools="http://schemas.android.com/tools"
+					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="250dp"
+					a:minResizeHeight="180dp"
+					a:minResizeWidth="180dp"
+					a:minWidth="250dp"
+					a:previewImage="@drawable/widget_preview"
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"
+					tools:ignore="UnusedAttribute"/>
diff --git a/android-app/src/main/res/xml/calculator_widget_info.xml b/android-app/src/main/res/xml/calculator_widget_info.xml
index 8ca2536e..40343fc4 100644
--- a/android-app/src/main/res/xml/calculator_widget_info.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info.xml
@@ -23,12 +23,12 @@
   -->
 
 <appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
-					a:minWidth="180dp"
-					a:minHeight="180dp"
-					a:initialLayout="@layout/widget_layout"
+					xmlns:tools="http://schemas.android.com/tools"
 					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
-					a:widgetCategory="home_screen|keyguard"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="180dp"
+					a:minWidth="180dp"
 					a:previewImage="@drawable/widget_preview"
-					a:resizeMode="horizontal|vertical">
-
-</appwidget-provider>
\ No newline at end of file
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"
+					tools:ignore="UnusedAttribute"/>
diff --git a/android-app/src/main/res/xml/calculator_widget_info_3x3.xml b/android-app/src/main/res/xml/calculator_widget_info_3x3.xml
index 8ca2536e..b0a9e5f0 100644
--- a/android-app/src/main/res/xml/calculator_widget_info_3x3.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info_3x3.xml
@@ -23,12 +23,10 @@
   -->
 
 <appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
-					a:minWidth="180dp"
-					a:minHeight="180dp"
-					a:initialLayout="@layout/widget_layout"
 					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
-					a:widgetCategory="home_screen|keyguard"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="180dp"
+					a:minWidth="180dp"
 					a:previewImage="@drawable/widget_preview"
-					a:resizeMode="horizontal|vertical">
-
-</appwidget-provider>
\ No newline at end of file
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"/>
diff --git a/android-app/src/main/res/xml/calculator_widget_info_3x4.xml b/android-app/src/main/res/xml/calculator_widget_info_3x4.xml
index c19ef448..641bb157 100644
--- a/android-app/src/main/res/xml/calculator_widget_info_3x4.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info_3x4.xml
@@ -23,12 +23,10 @@
   -->
 
 <appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
-					a:minWidth="180dp"
-					a:minHeight="250dp"
-					a:initialLayout="@layout/widget_layout"
 					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
-					a:widgetCategory="home_screen|keyguard"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="250dp"
+					a:minWidth="180dp"
 					a:previewImage="@drawable/widget_preview"
-					a:resizeMode="horizontal|vertical">
-
-</appwidget-provider>
\ No newline at end of file
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"/>
diff --git a/android-app/src/main/res/xml/calculator_widget_info_4x4.xml b/android-app/src/main/res/xml/calculator_widget_info_4x4.xml
index 99425b46..a0f72dc1 100644
--- a/android-app/src/main/res/xml/calculator_widget_info_4x4.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info_4x4.xml
@@ -23,12 +23,14 @@
   -->
 
 <appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
-					a:minWidth="250dp"
-					a:minHeight="250dp"
-					a:initialLayout="@layout/widget_layout"
+					xmlns:tools="http://schemas.android.com/tools"
 					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
-					a:widgetCategory="home_screen|keyguard"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="250dp"
+					a:minResizeHeight="180dp"
+					a:minResizeWidth="180dp"
+					a:minWidth="250dp"
 					a:previewImage="@drawable/widget_preview"
-					a:resizeMode="horizontal|vertical">
-
-</appwidget-provider>
\ No newline at end of file
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"
+					tools:ignore="UnusedAttribute"/>
diff --git a/android-app/src/main/res/xml/calculator_widget_info_4x5.xml b/android-app/src/main/res/xml/calculator_widget_info_4x5.xml
index 1c71062e..e165e891 100644
--- a/android-app/src/main/res/xml/calculator_widget_info_4x5.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info_4x5.xml
@@ -23,12 +23,12 @@
   -->
 
 <appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
-					a:minWidth="250dp"
-					a:minHeight="320dp"
-					a:initialLayout="@layout/widget_layout"
 					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
-					a:widgetCategory="home_screen|keyguard"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="320dp"
+					a:minResizeHeight="180dp"
+					a:minResizeWidth="180dp"
+					a:minWidth="250dp"
 					a:previewImage="@drawable/widget_preview"
-					a:resizeMode="horizontal|vertical">
-
-</appwidget-provider>
\ No newline at end of file
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"/>
\ No newline at end of file