commit 4098a67a639a492ad1b305c80eaab50244088f31
author Setup Wizard Team <android-setup-team-eng@google.com> Fri Jul 30 21:52:21 2021 +0800
committer Pasty Chang <pastychang@google.com> Mon Aug 02 05:22:01 2021 +0000
tree f1084134552eabbf08cbae185bd09e6cfb513c81
parent f99227386859e9f3aefda18d942834c0b33ae9ea

Import updated Android SetupCompat Library 387794681

Copied from google3/third_party/java_src/android_libs/setupcompat

Test: mm
Bug: 387794681
Included changes:
  - 387794681 Add to catch NotFoundException for the partner config api
  - 387496897 [Tablet] Make the buttons center vertical

PiperOrigin-RevId: 387794681
Change-Id: Iec91a89c9fff4e074bc117684d8b06317bc8f722

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;