From d0c6c159e5c976058292fe35c2b64dca3fa761aa Mon Sep 17 00:00:00 2001 From: Phie Date: Mon, 5 Oct 2020 09:06:25 +0200 Subject: [PATCH 1/8] Revert "Revert "Pie clean top bar"" This reverts commit 85649e2d35b1ee3692dd2bb1eb50af224239d01e. --- .../res/values/defaults.xml | 4 +- .../LineageDatabaseHelper.java | 50 +++++++++++++++++-- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml index 79dbd4a6..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 @@ -116,6 +116,6 @@ * 1: show the clock in the center * 2: show the clock in the left position (LTR) --> - 2 + 1 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 f7c923a2024279e13f9465b56adcefbec6ee09a5 Mon Sep 17 00:00:00 2001 From: Phie Date: Mon, 5 Oct 2020 09:10:29 +0200 Subject: [PATCH 2/8] update to put clock on the left back again --- .../LineageDatabaseHelper.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index 9fa40148..e5d1526a 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -52,7 +52,7 @@ 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_DB_INCREMENT = 2; private static final int E_DATABASE_VERSION = DATABASE_VERSION+E_DB_INCREMENT; private static final String DATABASE_NAME_OLD = "cmsettings.db"; @@ -469,6 +469,26 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ db.endTransaction(); } } + eUpgradeVersion = 13; + } + if (eUpgradeVersion < 14) { + 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, 2); + 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(); + } + } eUpgradeVersion = 14; } // *** Remember to update DATABASE_VERSION above! -- GitLab From 3c9ff414a15cbb4f3639836810df15c7c7e7b478 Mon Sep 17 00:00:00 2001 From: Phie Date: Mon, 5 Oct 2020 09:11:22 +0200 Subject: [PATCH 3/8] default clock to the left --- 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 b73e00be..d4e27613 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) --> - 1 + 2 -- GitLab From aaaf864e673ed7ac13658ab524b698e81c630a75 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Fri, 23 Oct 2020 08:33:05 +0000 Subject: [PATCH 4/8] removing useless part of the code --- .../lineagesettings/LineageDatabaseHelper.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index e5d1526a..558ec492 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -439,23 +439,8 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ 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); @@ -473,7 +458,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ } if (eUpgradeVersion < 14) { if (mUserHandle == UserHandle.USER_OWNER) { - // Update STATUS_BAR_CLOCK + // Update STATUS_BAR_CLOCK because was centered by db 13 before (not in code anymore) db.beginTransaction(); SQLiteStatement stmt = null; try { -- GitLab From 9cb99a813035aa3c7906903d8000e28b10412c60 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Fri, 23 Oct 2020 08:36:46 +0000 Subject: [PATCH 5/8] no need to center clock here too --- .../org/lineageos/lineagesettings/LineageDatabaseHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index 558ec492..c021b88b 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -340,7 +340,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ if (value == 0) { stmt = db.compileStatement("UPDATE system SET value=? WHERE name=?"); - stmt.bindLong(1, 1); + stmt.bindLong(1, 2); stmt.bindString(2, LineageSettings.System.STATUS_BAR_CLOCK); stmt.execute(); } -- GitLab From bbb46ec3a70ec72dcc612f793f20b2c83302f8c1 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Fri, 23 Oct 2020 08:42:35 +0000 Subject: [PATCH 6/8] display as icon (again) --- 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 d4e27613..9fb1444f 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 --> - 2 + 1 true -- GitLab From d758a393357b33d626a0d7fd5a22cdf5d5564b56 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Fri, 23 Oct 2020 08:43:06 +0000 Subject: [PATCH 7/8] Display as icon (again) --- 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 9fb1444f..79dbd4a6 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 --> - 1 + 0 true -- GitLab From 6d4a9cf7026a642c374cfeb6ecfd2756a79d9628 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Fri, 23 Oct 2020 08:45:14 +0000 Subject: [PATCH 8/8] display battery as icon --- .../LineageDatabaseHelper.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index c021b88b..061dedf2 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -438,41 +438,41 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ if(upgradeVersion > eUpgradeVersion) eUpgradeVersion = upgradeVersion; if (eUpgradeVersion < 13) { + eUpgradeVersion = 13; + } + if (eUpgradeVersion < 14) { if (mUserHandle == UserHandle.USER_OWNER) { + // Update STATUS_BAR_CLOCK because was centered by db 13 before (not in code anymore) db.beginTransaction(); SQLiteStatement 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.bindString(2, LineageSettings.System.STATUS_BAR_CLOCK); stmt.execute(); db.setTransactionSuccessful(); } catch (SQLiteDoneException ex) { - // LineageSettings.System.STATUS_BAR_BATTERY_STYLE is not set + // LineageSettings.System.STATUS_BAR_CLOCK is not set } finally { if (stmt != null) stmt.close(); db.endTransaction(); - } - } - eUpgradeVersion = 13; - } - if (eUpgradeVersion < 14) { - if (mUserHandle == UserHandle.USER_OWNER) { - // Update STATUS_BAR_CLOCK because was centered by db 13 before (not in code anymore) + } + // Update STATUS_BAR_BATTERY_STYLE because was displayed as text by db 13 before (not in code anymore) db.beginTransaction(); - SQLiteStatement stmt = null; + stmt = null; try { stmt = db.compileStatement("UPDATE system SET value=? WHERE name=?"); - stmt.bindLong(1, 2); - stmt.bindString(2, LineageSettings.System.STATUS_BAR_CLOCK); + stmt.bindLong(1, 0); + stmt.bindString(2, LineageSettings.System.STATUS_BAR_BATTERY_STYLE); stmt.execute(); db.setTransactionSuccessful(); } catch (SQLiteDoneException ex) { - // LineageSettings.System.STATUS_BAR_CLOCK is not set + // LineageSettings.System.STATUS_BAR_BATTERY_STYLE is not set } finally { if (stmt != null) stmt.close(); db.endTransaction(); } + } eUpgradeVersion = 14; } -- GitLab