diff --git a/app/app.iml b/app/app.iml
index 05d7d2de..436535aa 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -8,12 +8,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -23,19 +23,40 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 1d8de990..cd6217e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,11 +7,20 @@ android {
buildToolsVersion "21.0.2"
defaultConfig {
- applicationId "com.limelight.root"
minSdkVersion 16
targetSdkVersion 21
}
+ productFlavors {
+ root {
+ applicationId "com.limelight.root"
+ }
+
+ nonRoot {
+ applicationId "com.limelight"
+ }
+ }
+
buildTypes {
release {
runProguard false
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 996adb2c..dc1fe292 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,6 @@
-
-
+ package="com.limelight">
@@ -14,9 +8,6 @@
-
-
-
@@ -24,14 +15,12 @@
+ android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
@@ -44,8 +33,7 @@
android:name="com.limelight.PcViewTv"
android:logo="@drawable/atv_banner"
android:icon="@drawable/atv_banner"
- android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
- android:label="@string/app_name">
+ android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
diff --git a/app/src/main/java/com/limelight/AddComputerManually.java b/app/src/main/java/com/limelight/AddComputerManually.java
index dc14c314..20251528 100644
--- a/app/src/main/java/com/limelight/AddComputerManually.java
+++ b/app/src/main/java/com/limelight/AddComputerManually.java
@@ -5,7 +5,7 @@ import java.net.UnknownHostException;
import java.util.concurrent.LinkedBlockingQueue;
import com.limelight.computers.ComputerManagerService;
-import com.limelight.root.R;
+import com.limelight.R;
import com.limelight.utils.Dialog;
import android.app.Activity;
diff --git a/app/src/main/java/com/limelight/AdvancedSettings.java b/app/src/main/java/com/limelight/AdvancedSettings.java
index 4ac89788..ecaac687 100644
--- a/app/src/main/java/com/limelight/AdvancedSettings.java
+++ b/app/src/main/java/com/limelight/AdvancedSettings.java
@@ -1,6 +1,6 @@
package com.limelight;
-import com.limelight.root.R;
+import com.limelight.R;
import com.limelight.utils.Dialog;
import android.app.Activity;
diff --git a/app/src/main/java/com/limelight/AppView.java b/app/src/main/java/com/limelight/AppView.java
index 6c68bc10..6fb6f2b1 100644
--- a/app/src/main/java/com/limelight/AppView.java
+++ b/app/src/main/java/com/limelight/AppView.java
@@ -12,7 +12,7 @@ import com.limelight.binding.PlatformBinding;
import com.limelight.nvstream.http.GfeHttpResponseException;
import com.limelight.nvstream.http.NvApp;
import com.limelight.nvstream.http.NvHTTP;
-import com.limelight.root.R;
+import com.limelight.R;
import com.limelight.utils.Dialog;
import com.limelight.utils.SpinnerDialog;
diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java
index ae26e0dc..2dc19159 100644
--- a/app/src/main/java/com/limelight/Game.java
+++ b/app/src/main/java/com/limelight/Game.java
@@ -14,7 +14,7 @@ import com.limelight.nvstream.StreamConfiguration;
import com.limelight.nvstream.av.video.VideoDecoderRenderer;
import com.limelight.nvstream.input.KeyboardPacket;
import com.limelight.nvstream.input.MouseButtonPacket;
-import com.limelight.root.R;
+import com.limelight.R;
import com.limelight.utils.Dialog;
import com.limelight.utils.SpinnerDialog;
diff --git a/app/src/main/java/com/limelight/PcView.java b/app/src/main/java/com/limelight/PcView.java
index 8198e2d0..74514602 100644
--- a/app/src/main/java/com/limelight/PcView.java
+++ b/app/src/main/java/com/limelight/PcView.java
@@ -14,7 +14,7 @@ import com.limelight.nvstream.http.NvHTTP;
import com.limelight.nvstream.http.PairingManager;
import com.limelight.nvstream.http.PairingManager.PairState;
import com.limelight.nvstream.wol.WakeOnLanSender;
-import com.limelight.root.R;
+import com.limelight.R;
import com.limelight.utils.Dialog;
import android.app.Activity;
diff --git a/app/src/main/java/com/limelight/StreamSettings.java b/app/src/main/java/com/limelight/StreamSettings.java
index f272106c..ea8ae2a7 100644
--- a/app/src/main/java/com/limelight/StreamSettings.java
+++ b/app/src/main/java/com/limelight/StreamSettings.java
@@ -1,6 +1,6 @@
package com.limelight;
-import com.limelight.root.R;
+import com.limelight.R;
import com.limelight.utils.Dialog;
import android.os.Bundle;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0ea8ea59..deff2c1b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,6 @@
- Limelight (Root)
IP address of GeForce PC
diff --git a/app/src/nonRoot/AndroidManifest.xml b/app/src/nonRoot/AndroidManifest.xml
new file mode 100644
index 00000000..307ca9e1
--- /dev/null
+++ b/app/src/nonRoot/AndroidManifest.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/nonRoot/java/com.limelight/LimelightBuildProps.java b/app/src/nonRoot/java/com.limelight/LimelightBuildProps.java
new file mode 100644
index 00000000..c3934275
--- /dev/null
+++ b/app/src/nonRoot/java/com.limelight/LimelightBuildProps.java
@@ -0,0 +1,5 @@
+package com.limelight;
+
+public class LimelightBuildProps {
+ public static final boolean ROOT_BUILD = false;
+}
diff --git a/app/src/root/AndroidManifest.xml b/app/src/root/AndroidManifest.xml
new file mode 100644
index 00000000..b900aca1
--- /dev/null
+++ b/app/src/root/AndroidManifest.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/limelight/LimelightBuildProps.java b/app/src/root/java/com.limelight/LimelightBuildProps.java
similarity index 100%
rename from app/src/main/java/com/limelight/LimelightBuildProps.java
rename to app/src/root/java/com.limelight/LimelightBuildProps.java