From bbcd9217a8ab0f7f09dde6f8330d8777abda76d8 Mon Sep 17 00:00:00 2001
From: Kshitij Gupta <kshitijgm@gmail.com>
Date: Fri, 1 Nov 2024 11:30:34 +0100
Subject: [PATCH 1/2] LineageSettingsProvider: Use framework value for
 def_lockscreen_rotation

- Smallest Width varies based on orientation. This causes some tablets with
  narrower screens to not use the right default value
  (i.e. to allow lockscreen rotation by default)
---
 .../res/{values-sw600dp/defaults.xml => values/alias.xml}  | 7 +------
 packages/LineageSettingsProvider/res/values/defaults.xml   | 3 ---
 2 files changed, 1 insertion(+), 9 deletions(-)
 rename packages/LineageSettingsProvider/res/{values-sw600dp/defaults.xml => values/alias.xml} (84%)

diff --git a/packages/LineageSettingsProvider/res/values-sw600dp/defaults.xml b/packages/LineageSettingsProvider/res/values/alias.xml
similarity index 84%
rename from packages/LineageSettingsProvider/res/values-sw600dp/defaults.xml
rename to packages/LineageSettingsProvider/res/values/alias.xml
index b2fcbcf9..9a0f8ff5 100644
--- a/packages/LineageSettingsProvider/res/values-sw600dp/defaults.xml
+++ b/packages/LineageSettingsProvider/res/values/alias.xml
@@ -16,10 +16,5 @@
      limitations under the License.
 -->
 <resources>
-
-    <!-- Defaults for System -->
-
-    <!-- Default value for lockscreen rotation -->
-    <bool name="def_lockscreen_rotation">true</bool>
-
+    <item type="bool" name="def_lockscreen_rotation">@*android:bool/config_enableLockScreenRotation</item>
 </resources>
diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml
index ec6309be..32aa1c8b 100644
--- a/packages/LineageSettingsProvider/res/values/defaults.xml
+++ b/packages/LineageSettingsProvider/res/values/defaults.xml
@@ -82,7 +82,4 @@
     -->
     <integer name="def_clock_position">2</integer>
 
-    <!-- Default value for lockscreen rotation -->
-    <bool name="def_lockscreen_rotation">false</bool>
-
 </resources>
-- 
GitLab


From 2f22cf0a81165226018723e9563b25271bd115aa Mon Sep 17 00:00:00 2001
From: Kshitij Gupta <kshitijgm@gmail.com>
Date: Thu, 7 Nov 2024 11:07:03 +0100
Subject: [PATCH 2/2] chore: Move def_lockscreen_rotation back to defaults as
 bool

- As per CR
---
 .../res/values/alias.xml                      | 20 -------------------
 .../res/values/defaults.xml                   |  3 +++
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 packages/LineageSettingsProvider/res/values/alias.xml

diff --git a/packages/LineageSettingsProvider/res/values/alias.xml b/packages/LineageSettingsProvider/res/values/alias.xml
deleted file mode 100644
index 9a0f8ff5..00000000
--- a/packages/LineageSettingsProvider/res/values/alias.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014-2015 The CyanogenMod Project
-                   2019-2023 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <item type="bool" name="def_lockscreen_rotation">@*android:bool/config_enableLockScreenRotation</item>
-</resources>
diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml
index 32aa1c8b..428533eb 100644
--- a/packages/LineageSettingsProvider/res/values/defaults.xml
+++ b/packages/LineageSettingsProvider/res/values/defaults.xml
@@ -82,4 +82,7 @@
     -->
     <integer name="def_clock_position">2</integer>
 
+    <!-- Default value for lockscreen rotation -->
+    <bool name="def_lockscreen_rotation">@*android:bool/config_enableLockScreenRotation</bool>
+
 </resources>
-- 
GitLab