From 6943976bf150c723cd55cbfb145257ce14471f91 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 7 Apr 2018 14:41:28 -0400
Subject: Fix useragent update (#845)

* Test windows user agent

* Update dependencies

* Update KAU

* Switch back user agent and use android base

* Fix lint issues

* Fix lint part 2

* Test messenger user agent

* Update bugsnag release levels
---
 app/src/main/res/layout/activity_frame_wrapper.xml  | 4 +++-
 app/src/main/res/layout/activity_tab_customizer.xml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/activity_frame_wrapper.xml b/app/src/main/res/layout/activity_frame_wrapper.xml
index e51d3391..8d625933 100644
--- a/app/src/main/res/layout/activity_frame_wrapper.xml
+++ b/app/src/main/res/layout/activity_frame_wrapper.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/frame_wrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true" />
\ No newline at end of file
+    android:fitsSystemWindows="true"
+    tools:ignore="MergeRootFrame" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_tab_customizer.xml b/app/src/main/res/layout/activity_tab_customizer.xml
index b72bb953..8e540f11 100644
--- a/app/src/main/res/layout/activity_tab_customizer.xml
+++ b/app/src/main/res/layout/activity_tab_customizer.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MergeRootFrame">
 
     <View
         android:id="@+id/pseudo_toolbar"
-- 
cgit v1.2.3