diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-03 01:07:05 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-03 01:07:05 +0000 |
| commit | 5196588593bbde0bf68e990faeaedaa5b6de5760 (patch) | |
| tree | f1084134552eabbf08cbae185bd09e6cfb513c81 | |
| parent | 448b9f7108ed200765d679c7d870a4e6170a4d1e (diff) | |
| parent | 4098a67a639a492ad1b305c80eaab50244088f31 (diff) | |
| download | setupcompat-5196588593bbde0bf68e990faeaedaa5b6de5760.tar.gz | |
Snap for 7604864 from 4098a67a639a492ad1b305c80eaab50244088f31 to sc-v2-release
Change-Id: Ie96a2999fba1551f003eb68f8c6932764efc51a8
| -rw-r--r-- | main/java/com/google/android/setupcompat/template/FooterBarMixin.java | 2 | ||||
| -rw-r--r-- | partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java | 8 |
2 files changed, 5 insertions, 5 deletions
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 @@ public class FooterBarMixin implements Mixin { footerBarPaddingEnd, footerBarPaddingBottom); if (isFooterButtonAlignedEnd(buttonContainer.getContext())) { - buttonContainer.setGravity(Gravity.END); + buttonContainer.setGravity(Gravity.END | Gravity.CENTER_VERTICAL); } } 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 @@ public class PartnerConfigHelper { result = resource.getBoolean(resId); partnerResourceCache.put(resourceConfig, result); - } catch (NullPointerException exception) { + } catch (NullPointerException | NotFoundException exception) { // fall through } return result; @@ -364,7 +364,7 @@ public class PartnerConfigHelper { result = getDimensionFromTypedValue( context, (TypedValue) partnerResourceCache.get(resourceConfig)); - } catch (NullPointerException exception) { + } catch (NullPointerException | NotFoundException exception) { // fall through } return result; @@ -408,7 +408,7 @@ public class PartnerConfigHelper { 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 @@ public class PartnerConfigHelper { result = resource.getInteger(resId); partnerResourceCache.put(resourceConfig, result); - } catch (NullPointerException exception) { + } catch (NullPointerException | NotFoundException exception) { // fall through } return result; |