diff options
author | Allan Wang <me@allanwang.ca> | 2018-04-07 14:41:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-07 14:41:28 -0400 |
commit | 6943976bf150c723cd55cbfb145257ce14471f91 (patch) | |
tree | ffc05cb1385e66daed29c728f417b74e0f091ea1 /app/src/main/res/layout | |
parent | 7c1671f34328c509cf9850331225f8e4705e4abf (diff) | |
download | frost-6943976bf150c723cd55cbfb145257ce14471f91.tar.gz frost-6943976bf150c723cd55cbfb145257ce14471f91.tar.bz2 frost-6943976bf150c723cd55cbfb145257ce14471f91.zip |
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
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/activity_frame_wrapper.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_tab_customizer.xml | 4 |
2 files changed, 6 insertions, 2 deletions
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" |