Improvement some layout ui things

WSTxda · Sep 19, 2024 · 261aa07 · 261aa07
1 parent 7824f75
commit 261aa07
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml b/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml
@@ -28,6 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:importantForAccessibility="no"
         android:src="@android:drawable/sym_def_app_icon" />
 
     <TextView
@@ -87,6 +88,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
+        android:divider="@null"
         android:nestedScrollingEnabled="true"
         tools:listitem="@android:layout/simple_list_item_2" />
 </LinearLayout>
diff --git a/play-services-core/src/main/res/layout/ask_push_notification.xml b/play-services-core/src/main/res/layout/ask_push_notification.xml
@@ -34,6 +34,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginBottom="18dp"
+            android:importantForAccessibility="no"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_cloud_messaging"
             app:tint="?attr/colorControlNormal">

diff --git a/play-services-core/src/main/res/layout/preference_material_card_view.xml b/play-services-core/src/main/res/layout/preference_material_card_view.xml
@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="17dp">
+        android:padding="18dp">
 
         <TextView
             android:id="@android:id/title"
@@ -25,8 +25,8 @@
             android:layout_gravity="start"
             android:ellipsize="marquee"
             android:maxLines="2"
-            tools:text="Title preference"
-            android:textAppearance="?attr/textAppearanceTitleMedium" />
+            android:textAppearance="?attr/textAppearanceTitleMedium"
+            tools:text="Title preference" />
 
         <TextView
             android:id="@android:id/summary"
@@ -35,8 +35,8 @@
             android:layout_gravity="start"
             android:layout_marginTop="8dp"
             android:maxLines="10"
-            tools:text="Summary preference"
             android:textAppearance="?attr/textAppearanceBodyMedium"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="Summary preference" />
     </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/play-services-core/src/main/res/layout/preference_material_switch.xml b/play-services-core/src/main/res/layout/preference_material_switch.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml -->
 <com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/switchWidget"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"

diff --git a/play-services-core/src/main/res/layout/preference_material_switch_bar.xml b/play-services-core/src/main/res/layout/preference_material_switch_bar.xml
@@ -5,7 +5,6 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

diff --git a/play-services-core/src/main/res/layout/signin_account_row.xml b/play-services-core/src/main/res/layout/signin_account_row.xml
@@ -6,7 +6,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     xmlns:tools="http://schemas.android.com/tools">
 

diff --git a/play-services-core/src/main/res/values-v27/themes.xml b/play-services-core/src/main/res/values-v27/themes.xml
@@ -6,12 +6,14 @@
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:navigationBarColor">?android:colorBackground</item>
         <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 
     <style name="Theme.Base.Dark">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:navigationBarColor">?android:colorBackground</item>
         <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 </resources>