aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-04 00:19:58 -0700
committerAllan Wang <me@allanwang.ca>2017-06-04 00:19:58 -0700
commit6fa685433e23ce56286c3fbcae9cf1ef7a1a6e68 (patch)
treeba67706c64882f471a2f560503e1c936c615b957 /app/src/main/res
parent771fcb54fd3902d17f6cbad39217be3edbffa114 (diff)
downloadfrost-6fa685433e23ce56286c3fbcae9cf1ef7a1a6e68.tar.gz
frost-6fa685433e23ce56286c3fbcae9cf1ef7a1a6e68.tar.bz2
frost-6fa685433e23ce56286c3fbcae9cf1ef7a1a6e68.zip
Fix log webview and use leak canary
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_login.xml10
-rw-r--r--app/src/main/res/values/strings.xml1
2 files changed, 10 insertions, 1 deletions
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 2c03624b..eef0e434 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -13,9 +13,17 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
+ android:theme="@style/AppTheme.AppBarOverlay"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay" />
- <include layout="@layout/login_webview" />
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="?attr/actionBarSize">
+
+ <include layout="@layout/login_webview" />
+
+ </FrameLayout>
</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 97c84093..f99bd0ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,4 +24,5 @@
<string name="photos">Photos</string>
<string name="loading_account">Getting everything ready…</string>
<string name="welcome">Welcome %s</string>
+ <string name="login">Login</string>
</resources>