summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Jacquart <guillaume.jacquart@hoodbrains.com>2023-05-24 06:58:31 +0000
committerGuillaume Jacquart <guillaume.jacquart@hoodbrains.com>2023-05-24 06:58:31 +0000
commit045261f84c1ac5ba4c8ed0f3dabd4ea53a1155c9 (patch)
tree9d593310acfbb8f03cda02a9201990bba703f506
parentc8223d5d13b6e6bd965b058da54714cd137a28f8 (diff)
parent89e06aaa3d629074fdef2c8c1ce9a212777d4b88 (diff)
Merge branch '1238-widget_not_resizable' into 'main'
1238: Make the Advanced Privacy widget looking good in icon grid See merge request e/os/advanced-privacy!131
-rw-r--r--.gitignore1
-rw-r--r--app/src/main/res/layout/widget.xml9
-rw-r--r--app/src/main/res/xml/widget_info.xml10
3 files changed, 14 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 9572f6d..09d358c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ local.properties
/.idea/runConfigurations.xml
/.idea/dbnavigator.xml
/.idea/deploymentTargetDropDown.xml
+/.idea/kotlinc.xml
gradle.xml
markdown-*.xml
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index ad7e2b9..8a84112 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -1,4 +1,5 @@
<!--
+ ~ Copyright (C) 2023 MURENA SAS
~ Copyright (C) 2022 E FOUNDATION
~
~ This program is free software: you can redistribute it and/or modify
@@ -14,10 +15,10 @@
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:background="@drawable/bg_widget"
@@ -808,4 +809,4 @@
android:gravity="center"
/>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml
index b20fd31..ade6849 100644
--- a/app/src/main/res/xml/widget_info.xml
+++ b/app/src/main/res/xml/widget_info.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
+ ~ Copyright (C) 2023 MURENA SAS
~ Copyright (C) 2022 E FOUNDATION
~
~ This program is free software: you can redistribute it and/or modify
@@ -19,9 +20,14 @@
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:initialKeyguardLayout="@layout/widget"
android:initialLayout="@layout/widget"
- android:minHeight="180dp"
+
+ android:resizeMode="none"
+ android:targetCellWidth="4"
+ android:targetCellHeight="3"
+
+ android:minHeight="110dp"
android:minWidth="250dp"
android:updatePeriodMillis="0"
android:widgetCategory="home_screen"
- /> \ No newline at end of file
+ />