commit d9aa6d9fd5b79750a72957a898e5c746b845e98d
author Setup Wizard Team <android-setup-team-eng@google.com> Mon Aug 02 14:09:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 02 14:09:34 2021 +0000
tree f1084134552eabbf08cbae185bd09e6cfb513c81
parent 053221fd4d643ce9eb8c7df895e733847d2fb0b4
parent c9e3073f6a946383efa46b80ba59dd82f36c6b05

Import updated Android SetupCompat Library 387794681 am: 4098a67a63 am: c9e3073f6a

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/15443813

Change-Id: Ib8c000c836ce1b9c954014dc8b85a5bede5c5cea

main/java/com/google/android/setupcompat/template/FooterBarMixin.java

diff --git a/main/java/com/google/android/setupcompat/template/FooterBarMixin.java b/main/java/com/google/android/setupcompat/template/FooterBarMixin.java
index 54f35c2..f30c0fb 100644
--- a/main/java/com/google/android/setupcompat/template/FooterBarMixin.java
+++ b/main/java/com/google/android/setupcompat/template/FooterBarMixin.java
@@ -278,7 +278,7 @@
         footerBarPaddingEnd,
         footerBarPaddingBottom);
     if (isFooterButtonAlignedEnd(buttonContainer.getContext())) {
-      buttonContainer.setGravity(Gravity.END);
+      buttonContainer.setGravity(Gravity.END | Gravity.CENTER_VERTICAL);
     }
   }
 

partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java

diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java
index 2ca8876..27bd521 100644
--- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java
+++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java
@@ -315,7 +315,7 @@
 
       result = resource.getBoolean(resId);
       partnerResourceCache.put(resourceConfig, result);
-    } catch (NullPointerException exception) {
+    } catch (NullPointerException | NotFoundException exception) {
       // fall through
     }
     return result;
@@ -364,7 +364,7 @@
       result =
           getDimensionFromTypedValue(
               context, (TypedValue) partnerResourceCache.get(resourceConfig));
-    } catch (NullPointerException exception) {
+    } catch (NullPointerException | NotFoundException exception) {
       // fall through
     }
     return result;
@@ -408,7 +408,7 @@
 
       result = resource.getFraction(resId, 1, 1);
       partnerResourceCache.put(resourceConfig, result);
-    } catch (NullPointerException exception) {
+    } catch (NullPointerException | NotFoundException exception) {
       // fall through
     }
     return result;
@@ -441,7 +441,7 @@
 
       result = resource.getInteger(resId);
       partnerResourceCache.put(resourceConfig, result);
-    } catch (NullPointerException exception) {
+    } catch (NullPointerException | NotFoundException exception) {
       // fall through
     }
     return result;