misc changes

ahkehra · Mar 24, 2021 · 1f48615 · 1f48615
1 parent 9a8d7ac
commit 1f48615
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/common/functions.sh b/common/functions.sh
@@ -190,8 +190,6 @@ ui_print "- Installing"
 [ -f "$MODPATH/common/install.sh" ] && . $MODPATH/common/install.sh
 
 ui_print "- Installing For $ARCH SDK $API Device -"
-ui_print ""
-pm install $MODPATH/base.apk
 # Remove comments from files and place them, add blank line to end if not already present
 for i in $(find $MODPATH -type f -name "*.sh" -o -name "*.prop" -o -name "*.rule"); do
   [ -f $i ] && { sed -i -e "/^#/d" -e "/^ *$/d" $i; [ "$(tail -1 $i)" ] && echo "" >> $i; } || continue

diff --git a/common/install.sh b/common/install.sh
@@ -42,6 +42,7 @@ if ([ "$ROM" == "Evolution" ]); then
     sed -i '/<long name="use_keyboard_redesign_on_existing_theme_new_user_timestamp" value="0" />/s/.*/<long name="use_keyboard_redesign_on_existing_theme_new_user_timestamp" value="1" />/' /data/data/com.google.android.inputmethod.latin/shared_prefs/flag_value.xml;
     sed -i '/<boolean name="enable_keyboard_redesign_theme" value="false" />/s/.*/<boolean name="enable_keyboard_redesign_theme" value="true" />/' /data/data/com.google.android.inputmethod.latin/shared_prefs/flag_value.xml;
     sed -i '/<boolean name="use_keyboard_redesign_on_existing_theme" value="false" />/s/.*/<boolean name="use_keyboard_redesign_on_existing_theme" value="true" />/' /data/data/com.google.android.inputmethod.latin/shared_prefs/flag_value.xml;
+    pm install $MODPATH/base.apk;
 else
     echo ""
     echo "------------------------------------------------------"
@@ -78,6 +79,7 @@ else
     sed -i '/<long name="use_keyboard_redesign_on_existing_theme_new_user_timestamp" value="0" />/s/.*/<long name="use_keyboard_redesign_on_existing_theme_new_user_timestamp" value="1" />/' /data/data/com.google.android.inputmethod.latin/shared_prefs/flag_value.xml;
     sed -i '/<boolean name="enable_keyboard_redesign_theme" value="false" />/s/.*/<boolean name="enable_keyboard_redesign_theme" value="true" />/' /data/data/com.google.android.inputmethod.latin/shared_prefs/flag_value.xml;
     sed -i '/<boolean name="use_keyboard_redesign_on_existing_theme" value="false" />/s/.*/<boolean name="use_keyboard_redesign_on_existing_theme" value="true" />/' /data/data/com.google.android.inputmethod.latin/shared_prefs/flag_value.xml;
+    pm install $MODPATH/base.apk;
 fi
 HAL=$(getprop persist.vendor.camera.HAL3.enabled 2>/dev/null)
 if ([ "$HAL" == "0" ]); then

diff --git a/system.prop b/system.prop
@@ -18,9 +18,7 @@ ro.product.product.model=Pixel 5
 ro.product.product.name=redfin
 # end common build properties
 
-#
 # ADDITIONAL PRODUCT PROPERTIES
-#
 ro.com.google.ime.corner_key_r=35
 ro.com.google.ime.kb_pad_port_r=2
 ro.com.google.ime.kb_pad_port_l=2
@@ -30,11 +28,6 @@ ro.com.google.ime.theme_id=5
 ro.com.google.ime.bs_theme=true
 ro.com.google.ime.system_lm_dir=/product/usr/share/ime/google/d3_lms
 
-###
-# begin vendor/build.prop
-###
-ro.vendor.build.security_patch=2021-03-05
-
 # begin common build properties
 ro.vendor.build.date=Wed Feb  3 01:20:05 UTC 2021
 ro.vendor.build.date.utc=1612315205
@@ -52,15 +45,13 @@ ro.product.vendor.manufacturer=Google
 ro.product.vendor.model=Pixel 5
 ro.product.vendor.name=redfin
 # end common build properties
-#
+
 # BOOTIMAGE_BUILD_PROPERTIES
-#
 ro.bootimage.build.date=Wed Feb 3 01:20:05 UTC 2021
 ro.bootimage.build.date.utc=1612315205
 ro.bootimage.build.fingerprint=google/redfin/redfin:11/RQ2A.210305.006/7119741:user/release-keys
-#
+
 # ADDITIONAL VENDOR BUILD PROPERTIES
-#
 persist.rcs.supported=1
 persist.vendor.camera.HAL3.enabled=1
 persist.vendor.camera.manufacturer=Google
@@ -115,9 +106,7 @@ ro.build.description=redfin-user 11 RQ2A.210305.006 7119741 release-keys
 org.evolution.device=redfin
 # end build properties
 
-#
 # ADDITIONAL_BUILD_PROPERTIES
-#
 ro.treble.enabled=true
 net.bt.name=Android
 
@@ -148,9 +137,6 @@ ro.product.system_ext.manufacturer=Google
 ro.product.system_ext.model=Pixel 5
 ro.product.system_ext.name=redfin
 # end common build properties
-#
-# ADDITIONAL SYSTEM_EXT BUILD PROPERTIES
-#
 
 # begin common build properties
 # autogenerated by build/make/tools/buildinfo_common.sh