From 7746e63373c905faa6d7e45e45fffc48d3ffff85 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 3 Aug 2017 22:21:51 -0700
Subject: Add IM notifications, FAQ, video uploading, and geolocations (#107)

* Test canary

* Update activities to use kau base

* Update dependencies

* Cherry pick faq

* Update kau and add faq

* Add readme badges

* Add im notifications and video uploading

* Update theme

* Update and fix unit tests

* Add geolocation

* Prepare alpha test

* Remove explicit nonnull request
---
 app/src/main/AndroidManifest.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'app/src/main/AndroidManifest.xml')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c4275ae6..c4b5b9dc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <!--<uses-permission android:name="android.permission.USE_FINGERPRINT" />-->
     <uses-permission android:name="com.android.vending.BILLING" />
 
@@ -18,13 +20,13 @@
         android:allowBackup="true"
         android:fullBackupContent="@xml/frost_backup_rules"
         android:icon="@mipmap/ic_launcher_round"
-        android:label="@string/app_name"
+        android:label="@string/frost_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/FrostTheme.Splash">
         <activity
             android:name=".StartActivity"
-            android:label="@string/app_name"
+            android:label="@string/frost_name"
             android:noHistory="true"
             android:theme="@style/FrostTheme.Splash">
             <intent-filter>
@@ -36,12 +38,12 @@
             android:name=".activities.MainActivity"
             android:configChanges="orientation|screenSize|locale"
             android:hardwareAccelerated="true"
-            android:label="@string/app_name"
+            android:label="@string/frost_name"
             android:theme="@style/FrostTheme" />
         <activity
             android:name=".activities.WebOverlayActivity"
             android:hardwareAccelerated="true"
-            android:label="@string/app_name"
+            android:label="@string/frost_name"
             android:launchMode="singleTop"
             android:theme="@style/FrostTheme.Overlay.Slide" />
         <activity
@@ -122,10 +124,13 @@
             android:theme="@style/Kau.About" />
         <activity
             android:name=".activities.ImageActivity"
-            android:theme="@style/Kau.ImagePicker.Overlay" />
+            android:theme="@style/FrostTheme.Transparent" />
         <activity
             android:name=".activities.ImagePickerActivity"
-            android:theme="@style/FrostTheme.Overlay.Slide" />
+            android:theme="@style/Kau.MediaPicker.Overlay" />
+        <activity
+            android:name=".activities.VideoPickerActivity"
+            android:theme="@style/Kau.MediaPicker.Overlay" />
 
         <service
             android:name=".services.NotificationService"
-- 
cgit v1.2.3