commit d3ea3528ce2cde0675d297ea934090c77f4b5f76 Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Mon Apr 1 21:39:53 2019 +0000

fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens

Bug 29906 Add API-level guard --- .../org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java index 584c0fc3cdde..8d42b13a2a8e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java @@ -106,11 +106,16 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg } });

- // This should be declared in the xml layout, however there is a bug - // preventing this (the XML attribute isn't actually defined in the - // SDK). - // https://issuetracker.google.com/issues/37036728 - connectButton.setClipToOutline(true); + if (Build.VERSION.SDK_INT > 20) { + // Round the button's edges, but only on API 21+. Earlier versions + // do not support this. + // + // This should be declared in the xml layout, however there is a bug + // preventing this (the XML attribute isn't actually defined in the + // SDK). + // https://issuetracker.google.com/issues/37036728 + connectButton.setClipToOutline(true); + }

configureGearCogClickHandler();