Fix resources and lint error

WSTxda · Feb 28, 2024 · c69ef9b · c69ef9b
1 parent 9540803
commit c69ef9b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/self_check.xml b/play-services-core/microg-ui-tools/src/main/res/layout/self_check.xml
@@ -30,10 +30,10 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
-            app:expandedTitleMarginEnd="@dimen/settings_expanded_title_margin_end"
-            app:expandedTitleMarginStart="@dimen/settings_expanded_title_margin_start"
+            app:expandedTitleMarginEnd="@dimen/expanded_title_margin_end"
+            app:expandedTitleMarginStart="@dimen/expanded_title_margin_start"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-            app:scrimVisibleHeightTrigger="@dimen/settings_scrim_visible_height_trigger">
+            app:scrimVisibleHeightTrigger="@dimen/scrim_visible_height_trigger">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"

diff --git a/play-services-core/microg-ui-tools/src/main/res/values/dimens.xml b/play-services-core/microg-ui-tools/src/main/res/values/dimens.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="scrim_visible_height_trigger">137dp</dimen>
+    <dimen name="expanded_title_margin_bottom">24dp</dimen>
+    <dimen name="expanded_title_margin_start">24dp</dimen>
+    <dimen name="expanded_title_margin_end">24dp</dimen>
+</resources>
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
@@ -51,7 +51,8 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM"
+        tools:ignore="ExactAlarm" />
 
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />