commit 02b01d285fc582d74926f8cfd1ceb42944ad7e79
author Cagdas Caglak <cagdascaglak@gmail.com> Sat Apr 22 02:35:44 2017 +0300
committer LuK1337 <priv.luk@gmail.com> Thu Nov 26 11:21:26 2020 +0100
tree deb03356d378bbf039be83b87ac444c4a9acbad3
parent a8015af4c4f3a74f180b2357c3a08029dfdb90ba

Gallery2: Fix views overlap

"No photos found" and camera button were overlapped.
Camera button layout params changed and it was moved no data text below
and aligned center horizontal.

Change-Id: Idd76efaa54dd178eb3ff2cb5fae3ca17ef5acea3

res/values/ids.xml

diff --git a/res/values/ids.xml b/res/values/ids.xml
index f5b4a48..93ea5c0 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -23,4 +23,6 @@
 
     <item type="id" name="ingest_notification_scanning" />
     <item type="id" name="ingest_notification_importing" />
+
+    <item type="id" name="empty_album" />
 </resources>

src/com/android/gallery3d/app/AlbumSetPage.java

diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index ec65896..2b87f97 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -261,6 +261,7 @@
             tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
             tvEmptyAlbum.setGravity(Gravity.CENTER);
             tvEmptyAlbum.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+            tvEmptyAlbum.setId(R.id.empty_album);
             RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
                     RelativeLayout.LayoutParams.WRAP_CONTENT,
                     RelativeLayout.LayoutParams.WRAP_CONTENT);
@@ -412,8 +413,14 @@
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
                 RelativeLayout.LayoutParams.WRAP_CONTENT,
                 RelativeLayout.LayoutParams.WRAP_CONTENT);
-        lp.addRule(RelativeLayout.CENTER_IN_PARENT);
+        if (tvEmptyAlbum != null && tvEmptyAlbum.getVisibility() == View.VISIBLE) {
+            lp.addRule(RelativeLayout.BELOW, tvEmptyAlbum.getId());
+            lp.addRule(RelativeLayout.CENTER_HORIZONTAL);
+        } else {
+            lp.addRule(RelativeLayout.CENTER_IN_PARENT);
+        }
         galleryRoot.addView(mCameraButton, lp);
+
         return true;
     }