Merge branch 'canary' into stable

# Conflicts:
#	MagiskModBase/module.prop
#	app/build.gradle
#	latestCanary.json
#	latestVersion.json

.github/edit2MakeNewCanary

@@ -1 +1 @@
-Editing this file will trigger the build script for a new canary..
+Editing this file will trigger the build script for a new canary.

CanaryChangelog.md

@@ -1,3 +1,47 @@
+**canary-242**  
+- 13QPR3: QS quick pulldown now responds to swipe down only  
+- 13QPR3: Fixed showing security input on device wake  
+
+**canary-241**  
+- 13QPR3Beta3: Fixed hiding privacy chips  
+- 13QPR3: Fixed taskbar size  
+- Fixed VoLTE icon appearance glitches  
+- Fixed VoLTE icon appearance glitches  
+
+**canary-240**  
+- 13QPR3: Fixed VoLTE icon appearance  
+- Changed keyguard pin shuffle behavior  
+- Fixed QS pulldown bug appeared a few canaries ago  
+
+**canary-239**  
+- Fixed lockscreen carrier text hiding when not supposed to  
+- 13QPR3: Fixed hiding ongoing privacy chips  
+
+**canary-238**  
+- Refreshed UI based on material 3! Shout out to Iconify dev Mahmud0808@Github for "personally" applying iconify UI to AOSPMods  
+
+**canary-237**  
+- Added option to change app icon to "always themed"  
+- 13QPR3: Fixed screenshot mods  
+
+**canary-236**  
+- 13QPR3: Fixed easy-unlock  
+- Fixed QQS brightness slider, broken in canary 235  
+- 13QPR1, 13QPR2: Fixed QS Quick pulldown, broken in canary 235  
+
+**canary-235**  
+- 13QPR3: Fixed QQS brightness slider  
+
+**canary-234**  
+- 13QPR3: Fixed taskbar  
+- 13QPR3: Fixed QS quick pulldown  
+- 13QPR3: Fixed statusbar double tap sleep  
+- 13QPR3: Fixed double tap actions on lockscreen  
+
+**canary-233**  
+- 13QPR3: Fixed QS header shortcuts  
+- 13QPR3: Fixed light QS theme  
+
 **canary-232**  
 - Fixed brightness slider's animation  
 - Fixed custom battery icon randomly not appearing immediately after restart  

README.md

@@ -75,6 +75,7 @@ Automated install/updates: only through in-app updater - updates will NOT appear
 - @ElTifo Portuguese
 - @cracky5322 Chinese Traditional
 - @JohnsonRan Chinese Simplified
+- @huajijam Chinese Simplified
 - @TireX228 Russian
 - @ygorigor Romanian
 - @krystianokris Polish
@@ -94,6 +95,10 @@ Automated install/updates: only through in-app updater - updates will NOT appear
 - @Katsuyuki-Karasawa Japanese
 - @potatosalad775 Korean
 - @hcosserat French
+- @deepanshpandey Hindi
+
+**UI design:**  
+- @Mahmud0808  
 
 **Graphic design:**  
 - JstormZx@Telegram (Icon and Banner) 

app/build.gradle

@@ -12,8 +12,8 @@ android {
 		applicationId "sh.siava.AOSPMods"
 		minSdk 33
 		targetSdk 33
-		versionCode 233
-		versionName "2.7.2"
+		versionCode 242
+		versionName "canary-242"
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}

app/src/main/AndroidManifest.xml

@@ -6,20 +6,20 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
-        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme.AOSPMods"
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".UpdateActivity"
             android:exported="false"
             android:label="@string/title_activity_update"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:parentActivityName=".SettingsActivity"/>
         <activity
             android:name=".updateActivity"
             android:exported="false"
             android:label="@string/title_activity_update"
-            android:theme="@style/AppTheme">
+            android:parentActivityName=".SettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.RUN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -30,22 +30,44 @@
             android:name=".SettingsActivity"
             android:exported="true"
             android:label="@string/title_activity_settings">
+        </activity>
+
+        <activity-alias
+            android:name=".SettingsActivityNormalIcon"
+            android:targetActivity=".SettingsActivity"
+            android:enabled="true"
+            android:icon="@mipmap/ic_launcher"
+            android:exported="true"
+            android:label="@string/title_activity_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
+        </activity-alias>
+
+        <activity-alias
+            android:name=".SettingsActivityAlternateIcon"
+            android:targetActivity=".SettingsActivity"
+            android:enabled="false"
+            android:icon="@mipmap/ic_launcher_themed"
+            android:exported="true"
+            android:label="@string/title_activity_settings">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
 
         <service
             android:name=".utils.VolumeTileService"
             android:label="Media Volume"
             android:icon="@drawable/ic_volume"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
             android:exported="true">
-        <intent-filter>
-            <action android:name="android.service.quicksettings.action.QS_TILE" />
-        </intent-filter>
-    </service>
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
 
         <provider
             android:name=".utils.RemotePrefProvider"