anbox: Show full screen until we get anbox server

[waydroid.git] / scripts / install.sh

diff --git a/scripts/install.sh b/scripts/install.sh
index f51def0f31c69f1d906959f01fe98e4988957832..879e84944ab90161724a0e93a8fba18bce75968a 100644 (file)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -48,7 +48,7 @@ fi
 
 echo "Installing packages"
 apt update
-apt install -y lxc1
+apt install -y lxc1 || apt install -y lxc
 apt install -y libgbinder sensorfw-qt5 libsensorfw-qt5-plugins || touch NO_SENSORS
 if [ ! -f NO_SENSORS ]; then
     rm anbox-sensors_0.1.0_${ARCH}.deb
@@ -83,15 +83,15 @@ if [ -f anbox.prop ]; then
 fi
 if grep -q "anbox.display_height" anbox.prop.bak; then
     grep "anbox.display_height" anbox.prop.bak >> anbox.prop
-else
-    echo "NOTE: Edit /home/anbox/anbox.prop based on your device screen resolution"
-    echo "anbox.display_height=1920" >> anbox.prop
 fi
 if grep -q "anbox.display_width" anbox.prop.bak; then
     grep "anbox.display_width" anbox.prop.bak >> anbox.prop
-else
-    echo "NOTE: Edit /home/anbox/anbox.prop based on your device screen resolution"
-    echo "anbox.display_width=1080" >> anbox.prop
+fi
+if grep -q "anbox.display_height_padding" anbox.prop.bak; then
+    grep "anbox.display_height_padding" anbox.prop.bak >> anbox.prop
+fi
+if grep -q "anbox.display_width_padding" anbox.prop.bak; then
+    grep "anbox.display_width_padding" anbox.prop.bak >> anbox.prop
 fi
 echo "${GRALLOC_PROP}" >> anbox.prop
 echo "${EGL_PROP}" >> anbox.prop
@@ -108,6 +108,8 @@ if [ -f NO_SENSORS ]; then
        echo "anbox.stub_sensors_hal=1" >> anbox.prop
        rm NO_SENSORS
 fi
+# TODO: Drop this
+echo "anbox.active_apps=full" >> anbox.prop
 
 # TODO: Get rid of this
 rm -f vendor-fixup.sh