v2.9.2

.gitattributes

@@ -1,7 +1,5 @@
 # Auto detect text files and perform LF normalization
 * text=auto
-#track Large Files
-*.xz filter=lfs diff=lfs merge=lfs -text
 # Declare files that will always have LF line endings on checkout.
 *.sh text eol=lf
 *.prop text eol=lf

README.md

@@ -33,6 +33,7 @@ As a Mi A1 user, I was stuck with Stock Oreo 8.0.0 without Oreo custom ROMs when
 -   OVER = Install pixel overlays
 -   ACC = Install pixel accent
 -   BOOT = Install pixel boot animation
+-   FONT = Install pixel fonts
 -   To use the basename zip feature all you need to do is add the options to the zipname and only flash the zip in recovery. Magisk renames all zips to install.zip so flashing in magisk manager will NOT work. Heres an example of using basename to install full and overlays ( Pix3lify-2.6-full-over.zip )
 -   The options can either be full, Full, or FULL ( applies to all options )
 
@@ -54,11 +55,18 @@ As a Mi A1 user, I was stuck with Stock Oreo 8.0.0 without Oreo custom ROMs when
 -   Enables Google Assistant
 -   Enables Night Light (device dependent)
 
-## ⭐ Features Under Development
+## ⭐ Changelog
 
--   Flip to Shhh (mileage may vary)
+### v2.9.1
 
-## ⭐ Changelog
+-   Fix hanging in terminal script
+-   Detect if dialer is installed
+-   Fix find command
+-   Remove autoDND/flip to shhh
+-   Fix Wellbeing
+-   Bug fixes
+-   Unity update
+-   Add font option
 
 ### v2.9
 

common/install.sh

@@ -61,14 +61,15 @@ patch_xml() {
 }
 
 # Gets stock/limit from zip name
-SLIM=false; FULL=false; OVER=false BOOT=false; ACC=false
+SLIM=false; FULL=false; OVER=false BOOT=false; ACC=false; FONT=false
 OIFS=$IFS; IFS=\|
 case $(echo $(basename $ZIPFILE) | tr '[:upper:]' '[:lower:]') in
   *slim*|*Slim*|*SLIM*) SLIM=true;;
   *full*|*Full*|*FULL*) FULL=true;;
   *over*|*Over*|*OVER*) OVER=true;;
   *boot*|*Boot*|*BOOT*) BOOT=true;;
   *acc*|*Acc*|*ACC*) ACC=true;;
+  *font*|*Font*|*FONT*) FONT=true;;
 esac
 IFS=$OIFS
 
@@ -132,27 +133,34 @@ if [ "$SLIM" == false -a "$FULL" == false -a "$OVER" == false -a "$BOOT" == fals
         fi
       fi
       ui_print " "
-      log_print " - Overlay Options -"
-      log_print "   Do you want the Res overlays enabled?"
+      log_print " - Font Options -"
+      log_print "   Do you want to install custom fonts?"
       log_print "   Vol Up = Yes, Vol Down = No"
       if $VKSEL; then
-        OVER=true >> $INSTLOG 2>&1
+        FONT=true >> $INSTLOG 2>&1
         ui_print " "
-        log_print " - Accent Options -"
-        log_print "   Do you want the Pixel accent enabled?"
+        log_print " - Overlay Options -"
+        log_print "   Do you want the Res overlays enabled?"
         log_print "   Vol Up = Yes, Vol Down = No"
         if $VKSEL; then
-          ACC=true >> $INSTLOG 2>&1
+          OVER=true >> $INSTLOG 2>&1
+          ui_print " "
+          log_print " - Accent Options -"
+          log_print "   Do you want the Pixel accent enabled?"
+          log_print "   Vol Up = Yes, Vol Down = No"
+          if $VKSEL; then
+            ACC=true >> $INSTLOG 2>&1
+          fi
         fi
       fi
     fi
-    ui_print " "
-    log_print " - Animation Options -"
-    log_print "   Do you want the Pixel boot animation?"
-    log_print "   Vol Up = Yes, Vol Down = No"
-    if $VKSEL; then
-      BOOT=true >> $INSTLOG 2>&1
-    fi
+  ui_print " "
+  log_print " - Animation Options -"
+  log_print "   Do you want the Pixel boot animation?"
+  log_print "   Vol Up = Yes, Vol Down = No"
+  if $VKSEL; then
+    BOOT=true >> $INSTLOG 2>&1
+  fi
 else
   log_print " Options specified in zip name!"
 fi
@@ -213,20 +221,37 @@ if $BOOT; then
   ui_print " "
   log_print "   Enabling boot animation..."
   cp_ch -i $INSTALLER/common/bootanimation.zip $UNITY$BFOLDER$BZIP
-
 else
   ui_print " "
   log_print "   Disabling boot animation..."
 fi
 
+if $FONT; then
+  ui_print " "
+  log_print "   Enabling fonts..."
+  cp -rf /system/etc/fonts.xml $INSTALLER/system/etc/fonts.xml
+  for i in $(find $INSTALLER/system/fonts/GoogleSans-* | sed 's|.*-||'); do
+    sed -i "s|Roboto-$i|GoogleSans-$i|" $INSTALLER/system/etc/fonts.xml
+  done
+  for i in $(find /system/fonts/Clock* | sed 's|.*-||'); do
+    sed -i "s|Clock$i|GoogleSans-Regular|" $INSTALLER/system/etc/fonts.xml
+    ui_print " "
+    log_print "   Replacing LockScreen Font.."
+  done
+else
+  ui_print " "
+  log_print "   Disabling fonts..."
+  rm -rf $INSTALLER/system/fonts >> $INSTLOG 2>&1
+fi
+
 if [ $API -ge 27 ]; then
   rm -rf $INSTALLER/system/framework  >> $INSTLOG 2>&1
 fi
 
 if [ $API -ge 28 ]; then
   ui_print " "
   log_print "   Enabling Google's Call Screening..."
-  DPF=$(find /data/data/com.google.android.dialer*/shared_prefs/ -name "dialer_phenotype_flags.xml")
+  DPF=$(find /data/data/com.google.android.dialer* -name "dialer_phenotype_flags.xml")
   if [ -f $DPF ]; then
     # Enabling Google's Call Screening
     patch_xml -s $DPF '/map/boolean[@name="G__speak_easy_bypass_locale_check"]' "true" >> $INSTLOG 2>&1
@@ -241,27 +266,18 @@ if [ $API -ge 28 ]; then
   fi
 fi
 
-if [ "$SLIM" == "false" ]; then
-  ui_print " "
-  log_print "   Enabling Google's Flip to Shhh..."
-  ui_print " "
-  # Enabling Google's Flip to Shhh
-  WELLBEING_PREF_FILE=$INSTALLER/common/PhenotypePrefs.xml
-  chmod 660 $WELLBEING_PREF_FILE
-  WELLBEING_PREF_FOLDER=$(find /data/data/com.google.android.apps.wellbeing* -name "shared_prefs")
-  mkdir -p $WELLBEING_PREF_FOLDER
-  cp_ch $WELLBEING_PREF_FILE $WELLBEING_PREF_FOLDER
-  if $MAGISK && $BOOTMODE; then
-    magiskpolicy --live "create system_server sdcardfs file" "allow system_server sdcardfs file { write }"
-    am force-stop "com.google.android.apps.wellbeing"
-  fi
+if [ $API -lt 28 ]; then
+  rm -rf $MODPATH/system/app/MarkupGoogle1.apk
+  mv $MODPATH/system/app/MarkupGoogle2.apk $MODPATH/system/app/MarkupGoogle.apk
+else
+  rm -rf $MODPATH/system/app/MarkupGoogle2.apk
+  mv $MODPATH/system/app/MarkupGoogle1.apk $MODPATH/system/app/MarkupGoogle.apk
 fi
 
 # Adds slim & full variables to service.sh
 for i in "SLIM" "FULL"; do
   sed -i "2i $i=$(eval echo \$$i)" $INSTALLER/common/service.sh
 done
-cp_ch -n $INSTALLER/common/service.sh $UNITY/service.sh
 
 cp_ch -i $INSTALLER/common/unityfiles/tools/$ARCH32/xmlstarlet $INSTALLER/system/bin/xmlstarlet
 

common/post-fs-data.sh

@@ -67,10 +67,10 @@ patch_xml() {
 
 (
 if [ $API -ge "28" ]; then
-  DPF=$(find /data/data/com.google.android.dialer*/shared_prefs/ -name "dialer_phenotype_flags.xml")
+  DPF=$(find /data/data/com.google.android.dialer* -name "dialer_phenotype_flags.xml")
   if [ -f $DPF ]; then
     # Enabling Google's Call Screening
     #DIALERPATCHES
   fi
 fi
-)&
+)&

common/sepolicy.sh

@@ -1,3 +1,3 @@
 # Put sepolicy statements here
 # Example: allow { audioserver mediaserver } audioserver_tmpfs file { read write open }
-create system_server sdcardfs file allow system_server sdcardfs file { write }
+"create system_server sdcardfs file" "allow system_server sdcardfs file { write }"

common/service.sh

@@ -2,7 +2,6 @@
 # More info in the main Magisk thread
 
 if [ $API -ge 28 ] && [ $FULL ]; then
-  pm enable "com.google.android.apps.wellbeing/com.google.android.apps.wellbeing.autodnd.ui.AutoDndGesturesSettingsActivity"
   am force-stop "com.google.android.apps.wellbeing"
   if [[ $(pm list packages "com.google.android.soundpicker") ]]; then
     pm grant com.google.android.soundpicker android.permission.READ_EXTERNAL_STORAGE

common/uninstall.sh

@@ -5,7 +5,7 @@ fi
 if [ $API -ge 28 ]; then
   ui_print " "
   ui_print "   Disabling Google's Call Screening..."
-  DPF=$(find /data/data/com.google.android.dialer*/shared_prefs/ -name "dialer_phenotype_flags.xml")
+  DPF=$(find /data/data/com.google.android.dialer* -name "dialer_phenotype_flags.xml")
   if [ -f $DPF ]; then
     sed -i "/<!--$MODID-->/d" $DPF
     sed -i -e "s|<!--$MODID\(.*\)|\1|g" -e "s|\(.*\)$MODID-->|\1|g" $DPF
@@ -18,7 +18,7 @@ fi
 ui_print " "
 ui_print "   Disabling Google's Flip to Shhh..."
 # Disabling Google's Flip to Shhh
-WELLBEING_PREF_FILE=$(find /data/data/com.google.android.apps.wellbeing*/shared_prefs -name "PhenotypePrefs.xml")
+WELLBEING_PREF_FILE=$(find /data/data/com.google.android.apps.wellbeing* -name "PhenotypePrefs.xml")
 if [ -f $WELLBEING_PREF_FILE ]; then
   rm -f $WELLBEING_PREF_FILE
   if $BOOTMODE; then

common/unityfiles/util_functions.sh

@@ -632,7 +632,7 @@ mount_partitions
 api_level_arch_detect
 
 # Check for min & max api version
-[ -z $MINAPI ] && MINAPI=21 || { [ $MINAPI -lt 21 ] && MINAPI=21; }
+[ -z $MINAPI ] && MINAPI=17 || { [ $MINAPI -lt 17 ] && MINAPI=17; }
 [ $API -lt $MINAPI ] && { ui_print "! Your system API of $API is less than"; ui_print "!  the minimum api of $MINAPI!"; abort "! Aborting!"; }
 [ -z $MAXAPI ] || { [ $API -gt $MAXAPI ] && { ui_print "! Your system API of $API is greater than"; ui_print "!  the maximum api of $MINAPI!"; abort "! Aborting!"; }; }