diff --git a/app/src/main/java/org/mozilla/fenix/SearchWidgetProvider.kt b/app/src/main/java/org/mozilla/fenix/SearchWidgetProvider.kt
index 001a791014..34e7c6e55c 100644
--- a/app/src/main/java/org/mozilla/fenix/SearchWidgetProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/SearchWidgetProvider.kt
@@ -58,25 +58,24 @@ class SearchWidgetProvider : AppWidgetProvider() {
}
private fun getLayoutSize(dp: Int) = when {
- dp >= DP_EXTRA_LARGE -> SearchWidgetProviderSize.EXTRA_LARGE
dp >= DP_LARGE -> SearchWidgetProviderSize.LARGE
dp >= DP_MEDIUM -> SearchWidgetProviderSize.MEDIUM
dp >= DP_SMALL -> SearchWidgetProviderSize.SMALL
- else -> SearchWidgetProviderSize.EXTRA_SMALL
+ dp >= DP_EXTRA_SMALL -> SearchWidgetProviderSize.EXTRA_SMALL_V2
+ else -> SearchWidgetProviderSize.EXTRA_SMALL_V1
}
private fun getLayout(size: SearchWidgetProviderSize) = when (size) {
- SearchWidgetProviderSize.EXTRA_LARGE -> R.layout.search_widget_extra_large
SearchWidgetProviderSize.LARGE -> R.layout.search_widget_large
SearchWidgetProviderSize.MEDIUM -> R.layout.search_widget_medium
SearchWidgetProviderSize.SMALL -> R.layout.search_widget_small
- SearchWidgetProviderSize.EXTRA_SMALL -> R.layout.search_widget_extra_small
+ SearchWidgetProviderSize.EXTRA_SMALL_V2 -> R.layout.search_widget_extra_small_v2
+ SearchWidgetProviderSize.EXTRA_SMALL_V1 -> R.layout.search_widget_extra_small_v1
}
private fun getText(layout: SearchWidgetProviderSize, context: Context) = when (layout) {
SearchWidgetProviderSize.MEDIUM -> context.getString(R.string.search_widget_text_short)
- SearchWidgetProviderSize.LARGE,
- SearchWidgetProviderSize.EXTRA_LARGE -> context.getString(R.string.search_widget_text_long)
+ SearchWidgetProviderSize.LARGE -> context.getString(R.string.search_widget_text_long)
else -> null
}
@@ -107,7 +106,8 @@ class SearchWidgetProvider : AppWidgetProvider() {
): RemoteViews {
return RemoteViews(context.packageName, layout).apply {
when (layout) {
- R.layout.search_widget_extra_small -> {
+ R.layout.search_widget_extra_small_v1,
+ R.layout.search_widget_extra_small_v2 -> {
setOnClickPendingIntent(R.id.button_search_widget_new_tab, textSearchIntent)
}
R.layout.search_widget_small -> {
@@ -115,11 +115,10 @@ class SearchWidgetProvider : AppWidgetProvider() {
setOnClickPendingIntent(R.id.button_search_widget_voice, voiceSearchIntent)
}
R.layout.search_widget_medium,
- R.layout.search_widget_large,
- R.layout.search_widget_extra_large -> {
+ R.layout.search_widget_large -> {
setOnClickPendingIntent(R.id.button_search_widget_new_tab, textSearchIntent)
setOnClickPendingIntent(R.id.button_search_widget_voice, voiceSearchIntent)
- setTextViewText(R.id.text_search_widget, text)
+ setTextViewText(R.id.button_search_widget_new_tab, text)
}
}
}
@@ -127,19 +126,19 @@ class SearchWidgetProvider : AppWidgetProvider() {
// Cell sizes obtained from the actual dimensions listed in search widget specs
companion object {
+ private const val DP_EXTRA_SMALL = 64
private const val DP_SMALL = 100
private const val DP_MEDIUM = 192
private const val DP_LARGE = 256
- private const val DP_EXTRA_LARGE = 360
private const val REQUEST_CODE_NEW_TAB = 0
private const val REQUEST_CODE_VOICE = 1
}
}
enum class SearchWidgetProviderSize {
- EXTRA_SMALL,
+ EXTRA_SMALL_V1,
+ EXTRA_SMALL_V2,
SMALL,
MEDIUM,
LARGE,
- EXTRA_LARGE
}
diff --git a/app/src/main/res/layout/search_widget_extra_large.xml b/app/src/main/res/layout/search_widget_extra_large.xml
deleted file mode 100644
index e501858c12..0000000000
--- a/app/src/main/res/layout/search_widget_extra_large.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_widget_extra_small.xml b/app/src/main/res/layout/search_widget_extra_small.xml
deleted file mode 100644
index 87d2046378..0000000000
--- a/app/src/main/res/layout/search_widget_extra_small.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_widget_extra_small_v1.xml b/app/src/main/res/layout/search_widget_extra_small_v1.xml
new file mode 100644
index 0000000000..348ffb3ec1
--- /dev/null
+++ b/app/src/main/res/layout/search_widget_extra_small_v1.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_widget_extra_small_v2.xml b/app/src/main/res/layout/search_widget_extra_small_v2.xml
new file mode 100644
index 0000000000..106048db5b
--- /dev/null
+++ b/app/src/main/res/layout/search_widget_extra_small_v2.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_widget_large.xml b/app/src/main/res/layout/search_widget_large.xml
index 1e08a2ea72..3ab9ab0aba 100644
--- a/app/src/main/res/layout/search_widget_large.xml
+++ b/app/src/main/res/layout/search_widget_large.xml
@@ -3,43 +3,32 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
-
+
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_widget_medium.xml b/app/src/main/res/layout/search_widget_medium.xml
index 350a3ab115..20644843c9 100644
--- a/app/src/main/res/layout/search_widget_medium.xml
+++ b/app/src/main/res/layout/search_widget_medium.xml
@@ -3,43 +3,32 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
-
+
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_widget_small.xml b/app/src/main/res/layout/search_widget_small.xml
index be7cdec96c..c76087005e 100644
--- a/app/src/main/res/layout/search_widget_small.xml
+++ b/app/src/main/res/layout/search_widget_small.xml
@@ -3,35 +3,32 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
-
+
-
-
-
-
-
-
+ android:background="@drawable/ic_logo_widget"
+ android:layout_marginStart="9dp"/>
+
+
+
+
-
\ No newline at end of file