From 3f86d5c64b88a6c1cd993c889396811e4c87659b Mon Sep 17 00:00:00 2001 From: Alexandre Roux D'Anzi Date: Mon, 7 Sep 2020 16:44:41 +0200 Subject: [PATCH 1/3] set clock to center and battery to text after update --- .../LineageDatabaseHelper.java | 50 +++++++++++++++++-- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index 670b402f..9fa40148 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -52,6 +52,8 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ private static final String DATABASE_NAME = "lineagesettings.db"; private static final int DATABASE_VERSION = 12; + private static final int E_DB_INCREMENT = 1; + private static final int E_DATABASE_VERSION = DATABASE_VERSION+E_DB_INCREMENT; private static final String DATABASE_NAME_OLD = "cmsettings.db"; @@ -142,7 +144,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ * @param userId */ public LineageDatabaseHelper(Context context, int userId) { - super(context, dbNameForUser(context, userId, DATABASE_NAME), null, DATABASE_VERSION); + super(context, dbNameForUser(context, userId, DATABASE_NAME), null, E_DATABASE_VERSION); mContext = context; mUserHandle = userId; @@ -199,9 +201,12 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - if (LOCAL_LOGV) Log.d(TAG, "Upgrading from version: " + oldVersion + " to " + newVersion); + Log.d(TAG, "Upgrading from version: " + oldVersion + " to " + newVersion); int upgradeVersion = oldVersion; - + int eUpgradeVersion = oldVersion; + if(upgradeVersion>13){ + upgradeVersion = upgradeVersion - E_DB_INCREMENT; //to respect lineage version + } if (upgradeVersion < 2) { db.beginTransaction(); try { @@ -335,7 +340,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ if (value == 0) { stmt = db.compileStatement("UPDATE system SET value=? WHERE name=?"); - stmt.bindLong(1, 2); + stmt.bindLong(1, 1); stmt.bindString(2, LineageSettings.System.STATUS_BAR_CLOCK); stmt.execute(); } @@ -429,6 +434,43 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ } upgradeVersion = 12; } + + if(upgradeVersion > eUpgradeVersion) + eUpgradeVersion = upgradeVersion; + if (eUpgradeVersion < 13) { + if (mUserHandle == UserHandle.USER_OWNER) { + // Update STATUS_BAR_CLOCK + db.beginTransaction(); + SQLiteStatement stmt = null; + try { + stmt = db.compileStatement("UPDATE system SET value=? WHERE name=?"); + stmt.bindLong(1, 1); + stmt.bindString(2, LineageSettings.System.STATUS_BAR_CLOCK); + stmt.execute(); + db.setTransactionSuccessful(); + } catch (SQLiteDoneException ex) { + // LineageSettings.System.STATUS_BAR_CLOCK is not set + } finally { + if (stmt != null) stmt.close(); + db.endTransaction(); + } + db.beginTransaction(); + stmt = null; + try { + stmt = db.compileStatement("UPDATE system SET value=? WHERE name=?"); + stmt.bindLong(1, 2); + stmt.bindString(2, LineageSettings.System.STATUS_BAR_BATTERY_STYLE); + stmt.execute(); + db.setTransactionSuccessful(); + } catch (SQLiteDoneException ex) { + // LineageSettings.System.STATUS_BAR_BATTERY_STYLE is not set + } finally { + if (stmt != null) stmt.close(); + db.endTransaction(); + } + } + eUpgradeVersion = 14; + } // *** Remember to update DATABASE_VERSION above! } -- GitLab From b883b594e2cfaba0b22fabf4770cb33268bf5769 Mon Sep 17 00:00:00 2001 From: Alexandre Roux D'Anzi Date: Fri, 28 Aug 2020 16:55:02 +0200 Subject: [PATCH 2/3] center clock --- packages/LineageSettingsProvider/res/values/defaults.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml index 79dbd4a6..d1c368bc 100644 --- a/packages/LineageSettingsProvider/res/values/defaults.xml +++ b/packages/LineageSettingsProvider/res/values/defaults.xml @@ -116,6 +116,6 @@ * 1: show the clock in the center * 2: show the clock in the left position (LTR) --> - 2 + 1 -- GitLab From 77d1fdfddbc1060052859491f049cc8a08bed4aa Mon Sep 17 00:00:00 2001 From: Alexandre Roux D'Anzi Date: Fri, 28 Aug 2020 16:50:26 +0200 Subject: [PATCH 3/3] default with battery percentage --- packages/LineageSettingsProvider/res/values/defaults.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml index d1c368bc..b73e00be 100644 --- a/packages/LineageSettingsProvider/res/values/defaults.xml +++ b/packages/LineageSettingsProvider/res/values/defaults.xml @@ -40,7 +40,7 @@ * 1: Display the battery as a circle * 2: Display the battery as plain text --> - 0 + 2 true -- GitLab