Merge pull request #24145 from volzhs/android-version-gradle

Fix error/warning while building with android studio

2 files changed, 38 insertions, 35 deletions

diff --git a/platform/android/java/res/layout/downloading_expansion.xml b/platform/android/java/res/layout/downloading_expansion.xml
index d678d94eac..4a9700965f 100644
--- a/platform/android/java/res/layout/downloading_expansion.xml
+++ b/platform/android/java/res/layout/downloading_expansion.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="10dp"
             android:textStyle="bold" />
 
@@ -23,12 +23,11 @@
             android:id="@+id/downloaderDashboard"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/statusText"
             android:orientation="vertical" >
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:layout_weight="1" >
 
                 <TextView
@@ -36,18 +35,15 @@
                     style="@android:style/TextAppearance.Small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="5dp"
-                    android:text="0MB / 0MB" >
-                </TextView>
+                    android:layout_alignParentStart="true"
+                    android:layout_marginStart="5dp" />
 
                 <TextView
                     android:id="@+id/progressAsPercentage"
                     style="@android:style/TextAppearance.Small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignRight="@+id/progressBar"
-                    android:text="0%" />
+                    android:layout_alignEnd="@+id/progressBar" />
 
                 <ProgressBar
                     android:id="@+id/progressBar"
@@ -58,24 +54,23 @@
                     android:layout_marginBottom="10dp"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_weight="1" />
+                    android:layout_marginTop="10dp" />
 
                 <TextView
                     android:id="@+id/progressAverageSpeed"
                     style="@android:style/TextAppearance.Small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
                     android:layout_below="@+id/progressBar"
-                    android:layout_marginLeft="5dp" />
+                    android:layout_marginStart="5dp" />
 
                 <TextView
                     android:id="@+id/progressTimeRemaining"
                     style="@android:style/TextAppearance.Small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignRight="@+id/progressBar"
+                    android:layout_alignEnd="@+id/progressBar"
                     android:layout_below="@+id/progressBar" />
             </RelativeLayout>
 
@@ -86,33 +81,35 @@
                 android:orientation="horizontal" >
 
                 <Button
-                    android:id="@+id/pauseButton"
+                    android:id="@+id/cancelButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginBottom="10dp"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
                     android:layout_marginTop="10dp"
                     android:layout_weight="0"
                     android:minHeight="40dp"
                     android:minWidth="94dp"
-                    android:text="@string/text_button_pause" />
+                    android:text="@string/text_button_cancel"
+                    android:visibility="gone"
+                    style="?android:attr/buttonBarButtonStyle" />
 
                 <Button
-                    android:id="@+id/cancelButton"
+                    android:id="@+id/pauseButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginBottom="10dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="5dp"
                     android:layout_marginTop="10dp"
                     android:layout_weight="0"
                     android:minHeight="40dp"
                     android:minWidth="94dp"
-                    android:text="@string/text_button_cancel"
-                    android:visibility="gone" />
+                    android:text="@string/text_button_pause"
+                    style="?android:attr/buttonBarButtonStyle" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
@@ -151,7 +148,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_margin="10dp"
-                android:text="@string/text_button_resume_cellular" />
+                android:text="@string/text_button_resume_cellular"
+                style="?android:attr/buttonBarButtonStyle" />
 
             <Button
                 android:id="@+id/wifiSettingsButton"
@@ -159,7 +157,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_margin="10dp"
-                android:text="@string/text_button_wifi_settings" />
+                android:text="@string/text_button_wifi_settings"
+                style="?android:attr/buttonBarButtonStyle" />
             </LinearLayout>
     </LinearLayout>
 
diff --git a/platform/android/java/res/layout/status_bar_ongoing_event_progress_bar.xml b/platform/android/java/res/layout/status_bar_ongoing_event_progress_bar.xml
index 104993da7e..fae1faeb60 100644
--- a/platform/android/java/res/layout/status_bar_ongoing_event_progress_bar.xml
+++ b/platform/android/java/res/layout/status_bar_ongoing_event_progress_bar.xml
@@ -17,7 +17,8 @@
 */
 -->
 
-<LinearLayout android:layout_width="match_parent"
+<LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
     android:orientation="horizontal" android:id="@+id/notificationLayout" xmlns:android="http://schemas.android.com/apk/res/android">
@@ -33,16 +34,17 @@
             android:layout_width="fill_parent"
             android:layout_height="25dp"
             android:scaleType="centerInside"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
-            android:src="@android:drawable/stat_sys_download" />
+            android:src="@android:drawable/stat_sys_download"
+            android:contentDescription="@string/godot_project_name_string" />
 
         <TextView
             android:id="@+id/progress_text"
             style="@style/NotificationText"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignParentBottom="true"
             android:layout_gravity="center_horizontal"
             android:singleLine="true"
@@ -56,15 +58,16 @@
         android:clickable="true"
         android:focusable="true"
         android:paddingTop="10dp"
-        android:paddingRight="8dp"
-        android:paddingBottom="8dp" >
+        android:paddingEnd="8dp"
+        android:paddingBottom="8dp"
+        tools:ignore="RtlSymmetry">
 
         <TextView
             android:id="@+id/title"
             style="@style/NotificationTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:singleLine="true"/>
 
         <TextView
@@ -72,8 +75,9 @@
             style="@style/NotificationText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:singleLine="true"/>
+            android:layout_alignParentEnd="true"
+            android:singleLine="true"
+            tools:ignore="RelativeOverlap" />
         <!-- Only one of progress_bar and paused_text will be visible. -->
 
         <FrameLayout
@@ -87,7 +91,7 @@
                 style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:paddingRight="25dp" />
+                android:paddingEnd="25dp" />
 
             <TextView
                 android:id="@+id/description"
@@ -95,7 +99,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:paddingRight="25dp"
+                android:paddingEnd="25dp"
                 android:singleLine="true" />
         </FrameLayout>