diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-07-30 21:52:21 +0800 |
|---|---|---|
| committer | Pasty Chang <pastychang@google.com> | 2021-08-02 05:22:01 +0000 |
| commit | 4098a67a639a492ad1b305c80eaab50244088f31 (patch) | |
| tree | f1084134552eabbf08cbae185bd09e6cfb513c81 | |
| parent | f99227386859e9f3aefda18d942834c0b33ae9ea (diff) | |
| download | setupcompat-4098a67a639a492ad1b305c80eaab50244088f31.tar.gz | |
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
| -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; |