Merge branch 'fupduck_drawer' into mirror_0xacab_0.9.8

1 files changed, 36 insertions, 41 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f177f2c7..0a10b13c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,38 +14,35 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
     android:versionCode="132"
     android:versionName="0.9.8RC1" >
 
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="26" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
 		     android:maxSdkVersion="18"/>
 
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="26"/>
-
     <application
         android:name=".BitmaskApp"
         android:allowBackup="true"
         android:icon="@drawable/icon"
-        android:logo="@drawable/icon"
         android:label="@string/app_name"
-        android:theme="@style/blinkt">
-
+        android:logo="@drawable/icon"
+        android:theme="@style/BitmaskTheme">
         <service
-            android:name="se.leap.bitmaskclient.eip.VoidVpnService"
+            android:name=".eip.VoidVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
         </service>
-	
         <service
             android:name="de.blinkt.openvpn.core.OpenVPNService"
             android:permission="android.permission.BIND_VPN_SERVICE">
@@ -53,10 +50,12 @@
                 <action android:name="android.net.VpnService" />
             </intent-filter>
         </service>
-	<service android:name="se.leap.bitmaskclient.ProviderAPI" android:enabled="true"/>
+        <service
+            android:name=".ProviderAPI"
+            android:enabled="true" />
 
         <receiver
-            android:name="se.leap.bitmaskclient.OnBootReceiver"
+            android:name=".OnBootReceiver"
             android:enabled="true"
             android:permission="android.permission.RECEIVE_BOOT_COMPLETED" >
           <intent-filter android:priority="999">
@@ -64,33 +63,19 @@
           </intent-filter>
         </receiver>
 
-	<activity
-	    android:name="se.leap.bitmaskclient.eip.VoidVpnLauncher"
-	    android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-	
         <activity
-                android:name="de.blinkt.openvpn.activities.DisconnectVPN" />
-	
+            android:name=".eip.VoidVpnLauncher"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
             android:name="de.blinkt.openvpn.LaunchVPN"
-            android:label="@string/vpn_launch_title" >
-        </activity>
-	
+            android:label="@string/vpn_launch_title" />
         <activity
-            android:name="de.blinkt.openvpn.activities.LogWindow"
-            android:allowTaskReparenting="true"
-            android:label="@string/bitmask_log"
-            android:launchMode="singleTask" />
-
-        <activity
-            android:name="se.leap.bitmaskclient.Dashboard"
+            android:name=".Dashboard"
             android:label="@string/app_name"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:launchMode="singleTop"
-            >
-        </activity>
+            android:uiOptions="splitActionBarWhenNarrow" />
         <activity
-            android:name="se.leap.bitmaskclient.StartActivity"
+            android:name=".StartActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:noHistory="true"
@@ -103,17 +88,27 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
-            android:name="se.leap.bitmaskclient.ConfigurationWizard"
-            android:label="@string/configuration_wizard_title"
-            android:uiOptions="splitActionBarWhenNarrow" >
-        </activity>
+            android:name=".MainActivity"
+            android:label="@string/title_activity_main" />
+
         <activity
-            android:name="se.leap.bitmaskclient.AboutActivity"
-            android:label="@string/title_about_activity" >
-        </activity>
-        
-        <service android:name="se.leap.bitmaskclient.eip.EIP" android:exported="false">
+            android:name=".ConfigurationWizard"
+            android:label="@string/configuration_wizard_title" />
+
+        <activity
+            android:name=".ProviderDetailActivity"
+            android:label="@string/provider_details_title"
+            android:launchMode="singleTop" />
+
+        <activity android:name=".LoginActivity" />
+        <activity android:name=".SignupActivity"
+            android:theme="@style/BitmaskTheme"/>
+
+        <service
+            android:name=".eip.EIP"
+            android:exported="false">
             <intent-filter>
                 <action android:name="se.leap.bitmaskclient.EIP.UPDATE"/>
                 <action android:name="se.leap.bitmaskclient.EIP.START"/>