From af9126ffcb2612a6739b9e7bbb563286fdd57ea7 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 26 Jun 2018 21:25:59 -0400 Subject: [PATCH] More deduplication - Deduplicate Trebuchet default workspaces - Deduplicate LatinIME patches - Deduplicate SetupWizard assets - And fix a typo with grouper overclock --- .../logo.xml | 0 .../default_workspace_4x4.xml | 3 + .../default_workspace_5x5.xml | 3 + .../default_workspace_5x6.xml | 3 + .../0001-Voice.patch | 0 .../default_workspace_4x4.xml | 64 ------------- .../default_workspace_5x5.xml | 64 ------------- .../default_workspace_5x6.xml | 64 ------------- .../logo.xml | 34 ------- .../0001-Voice.patch | 93 ------------------- Scripts/LineageOS-14.1/Overclock.sh | 2 +- Scripts/LineageOS-14.1/Patch.sh | 4 +- Scripts/LineageOS-14.1/Rebrand.sh | 2 +- Scripts/LineageOS-15.1/Patch.sh | 4 +- Scripts/LineageOS-15.1/Rebrand.sh | 2 +- 15 files changed, 16 insertions(+), 326 deletions(-) rename Patches/{LineageOS-14.1 => Common}/android_packages_apps_SetupWizard/logo.xml (100%) rename Patches/{LineageOS-15.1 => Common}/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml (93%) rename Patches/{LineageOS-15.1 => Common}/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml (93%) rename Patches/{LineageOS-15.1 => Common}/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml (93%) rename Patches/{LineageOS-14.1 => Common}/android_packages_inputmethods_LatinIME/0001-Voice.patch (100%) delete mode 100644 Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml delete mode 100644 Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml delete mode 100644 Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml delete mode 100644 Patches/LineageOS-15.1/android_packages_apps_SetupWizard/logo.xml delete mode 100644 Patches/LineageOS-15.1/android_packages_inputmethods_LatinIME/0001-Voice.patch diff --git a/Patches/LineageOS-14.1/android_packages_apps_SetupWizard/logo.xml b/Patches/Common/android_packages_apps_SetupWizard/logo.xml similarity index 100% rename from Patches/LineageOS-14.1/android_packages_apps_SetupWizard/logo.xml rename to Patches/Common/android_packages_apps_SetupWizard/logo.xml diff --git a/Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml b/Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml similarity index 93% rename from Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml rename to Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml index b4b54e40..bf111ea8 100644 --- a/Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml +++ b/Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml @@ -56,6 +56,9 @@ + diff --git a/Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml b/Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml similarity index 93% rename from Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml rename to Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml index b4b54e40..bf111ea8 100644 --- a/Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml +++ b/Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml @@ -56,6 +56,9 @@ + diff --git a/Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml b/Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml similarity index 93% rename from Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml rename to Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml index bf0625c6..d1495659 100644 --- a/Patches/LineageOS-15.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml +++ b/Patches/Common/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml @@ -56,6 +56,9 @@ + diff --git a/Patches/LineageOS-14.1/android_packages_inputmethods_LatinIME/0001-Voice.patch b/Patches/Common/android_packages_inputmethods_LatinIME/0001-Voice.patch similarity index 100% rename from Patches/LineageOS-14.1/android_packages_inputmethods_LatinIME/0001-Voice.patch rename to Patches/Common/android_packages_inputmethods_LatinIME/0001-Voice.patch diff --git a/Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml b/Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml deleted file mode 100644 index 4c7e51f7..00000000 --- a/Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_4x4.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml b/Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml deleted file mode 100644 index 4c7e51f7..00000000 --- a/Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x5.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml b/Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml deleted file mode 100644 index 42c65cc9..00000000 --- a/Patches/LineageOS-14.1/android_packages_apps_Trebuchet/default_workspace/default_workspace_5x6.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/logo.xml b/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/logo.xml deleted file mode 100644 index 7006f0c9..00000000 --- a/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/logo.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - diff --git a/Patches/LineageOS-15.1/android_packages_inputmethods_LatinIME/0001-Voice.patch b/Patches/LineageOS-15.1/android_packages_inputmethods_LatinIME/0001-Voice.patch deleted file mode 100644 index 12bdebc9..00000000 --- a/Patches/LineageOS-15.1/android_packages_inputmethods_LatinIME/0001-Voice.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 0b916be981f926661c9e24d5ab8ded29bc9be7e2 Mon Sep 17 00:00:00 2001 -From: Tad -Date: Mon, 29 May 2017 20:25:28 -0400 -Subject: [PATCH] Remove voice input key - -Change-Id: Ifb56c679d3a9b6c035fcdd4596ec0b3b5653bea8 ---- - java/res/values-sw430dp/config-per-form-factor.xml | 2 +- - java/res/values/config-per-form-factor.xml | 2 +- - java/res/xml/prefs_screen_preferences.xml | 2 +- - .../inputmethod/latin/settings/PreferencesSettingsFragment.java | 3 +-- - java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 6 ++---- - 5 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/java/res/values-sw430dp/config-per-form-factor.xml b/java/res/values-sw430dp/config-per-form-factor.xml -index 8868081c3..2199ab6b2 100644 ---- a/java/res/values-sw430dp/config-per-form-factor.xml -+++ b/java/res/values-sw430dp/config-per-form-factor.xml -@@ -24,7 +24,7 @@ - - true - false -- true -+ false - true - -diff --git a/java/res/values/config-per-form-factor.xml b/java/res/values/config-per-form-factor.xml -index 67fc75134..1bbf1640e 100644 ---- a/java/res/values/config-per-form-factor.xml -+++ b/java/res/values/config-per-form-factor.xml -@@ -24,7 +24,7 @@ - - true - false -- true -+ false - true - -diff --git a/java/res/xml/prefs_screen_preferences.xml b/java/res/xml/prefs_screen_preferences.xml -index 101edc855..540f9f6a6 100644 ---- a/java/res/xml/prefs_screen_preferences.xml -+++ b/java/res/xml/prefs_screen_preferences.xml -@@ -48,6 +48,6 @@ - - -diff --git a/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java -index d9858e61f..cd513a47e 100644 ---- a/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java -+++ b/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java -@@ -56,8 +56,7 @@ public final class PreferencesSettingsFragment extends SubScreenFragment { - // initialization method of these classes here. See {@link LatinIME#onCreate()}. - RichInputMethodManager.init(context); - -- final boolean showVoiceKeyOption = res.getBoolean( -- R.bool.config_enable_show_voice_key_option); -+ final boolean showVoiceKeyOption = false; - if (!showVoiceKeyOption) { - removePreference(Settings.PREF_VOICE_INPUT_KEY); - } -diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java -index 918978949..4c8618234 100644 ---- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java -+++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java -@@ -137,9 +137,7 @@ public class SettingsValues { - mKeyPreviewPopupOn = Settings.readKeyPreviewPopupEnabled(prefs, res); - mSlidingKeyInputPreviewEnabled = prefs.getBoolean( - DebugSettings.PREF_SLIDING_KEY_INPUT_PREVIEW, true); -- mShowsVoiceInputKey = needsToShowVoiceInputKey(prefs, res) -- && mInputAttributes.mShouldShowVoiceInputKey -- && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN; -+ mShowsVoiceInputKey = false; - mIncludesOtherImesInLanguageSwitchList = Settings.ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS - ? prefs.getBoolean(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST, false) - : true /* forcibly */; -@@ -368,7 +366,7 @@ public class SettingsValues { - .remove(Settings.PREF_VOICE_MODE_OBSOLETE) - .apply(); - } -- return prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, true); -+ return prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, false); - } - - public String dump() { --- -2.13.0 - diff --git a/Scripts/LineageOS-14.1/Overclock.sh b/Scripts/LineageOS-14.1/Overclock.sh index df240b4e..f647b21f 100644 --- a/Scripts/LineageOS-14.1/Overclock.sh +++ b/Scripts/LineageOS-14.1/Overclock.sh @@ -31,7 +31,7 @@ patch -p1 < "$patches/android_kernel_asus_grouper/0001-Overclock.patch"; echo "CONFIG_TEGRA_CPU_OVERCLOCK=y" >> arch/arm/configs/grouper_defconfig; #1.30GHz -> 1.50GHz =+0.80GHz echo "CONFIG_TEGRA_CPU_OVERCLOCK_ULTIMATE" >> arch/arm/configs/grouper_defconfig; #1.30GHz -> 1.60GHz =+1.20GHz echo "CONFIG_TEGRA_GPU_OVERCLOCK=y" >> arch/arm/configs/grouper_defconfig; #416MHz 520MHz -echo "CONFIG_TEGRA_GAMING_FIX" >> arch/arm/configs/grouper_defconfig; +echo "CONFIG_TEGRA_GAMING_FIX=y" >> arch/arm/configs/grouper_defconfig; enter "kernel/lge/hammerhead"; patch -p1 < "$patches/android_kernel_lge_hammerhead/0001-Overclock.patch"; #2.26GHz -> 2.95GHz =+2.76GHz XXX: Untested! diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 29a62976..7b24de0d 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -153,7 +153,7 @@ enterAndClear "packages/apps/SetupWizard"; patch -p1 < "$patches/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch"; #Remove the rest of CMStats enterAndClear "packages/apps/Trebuchet"; -cp -r "$patches/android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; +cp -r "$patchesCommon/android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; enterAndClear "packages/apps/Updater"; patch -p1 < "$patches/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server @@ -169,7 +169,7 @@ sed -i 's/mCropView.setTouchEnabled(req.touchEnabled);/mCropView.setTouchEnabled sed -i 's/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0);/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0.5f);/' src/com/android/wallpaperpicker/WallpaperPickerActivity.java; #Center aligned by default enterAndClear "packages/inputmethods/LatinIME"; -patch -p1 < "$patches/android_packages_inputmethods_LatinIME/0001-Voice.patch"; #Remove voice input key +patch -p1 < "$patchesCommon/android_packages_inputmethods_LatinIME/0001-Voice.patch"; #Remove voice input key enterAndClear "packages/services/Telephony"; if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then patch -p1 < "$patches/android_packages_services_Telephony/Copperhead/0001-LTE_Only.patch"; fi; #LTE only preferred network mode choice (Copperhead CC BY-NC-SA) diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh index 7ec867bc..942d36f6 100644 --- a/Scripts/LineageOS-14.1/Rebrand.sh +++ b/Scripts/LineageOS-14.1/Rebrand.sh @@ -41,7 +41,7 @@ enter "packages/apps/SetupWizard"; sed -i 's|http://lineageos.org/legal|https://divestos.xyz/index.php?page=privacy_policy|' src/com/cyanogenmod/setupwizard/LineageSettingsActivity.java; sed -i '/.*setup_services/s/LineageOS/'"$REBRAND_NAME"'/' res/values*/strings.xml; sed -i '/.*services_explanation/s/LineageOS/'"$REBRAND_NAME"'/' res/values*/strings.xml; -cp "$patches/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours +cp "$patchesCommon/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours enter "packages/apps/Updater"; sed -i 's|>LineageOS|>'"$REBRAND_NAME"'|' res/values*/strings.xml; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index ce24dfeb..5584a534 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -159,7 +159,7 @@ enterAndClear "packages/apps/SetupWizard"; patch -p1 < "$patches/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch"; #Remove analytics enterAndClear "packages/apps/Trebuchet"; -cp -r "$patches/android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; +cp -r "$patchesCommon/android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; enterAndClear "packages/apps/Updater"; patch -p1 < "$patches/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server @@ -172,7 +172,7 @@ sed -i 's/mCropView.setTouchEnabled(req.touchEnabled);/mCropView.setTouchEnabled sed -i 's/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0);/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0.5f);/' src/com/android/wallpaperpicker/WallpaperPickerActivity.java; #Center aligned by default enterAndClear "packages/inputmethods/LatinIME"; -patch -p1 < "$patches/android_packages_inputmethods_LatinIME/0001-Voice.patch"; #Remove voice input key +patch -p1 < "$patchesCommon/android_packages_inputmethods_LatinIME/0001-Voice.patch"; #Remove voice input key enterAndClear "packages/services/Telephony"; if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then patch -p1 < "$patches/android_packages_services_Telephony/Copperhead/0001-LTE_Only.patch"; fi; #LTE only preferred network mode choice (Copperhead CC BY-NC-SA) diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index 6d6c2437..4a2c93bf 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -53,7 +53,7 @@ enter "packages/apps/SetupWizard"; sed -i 's|http://lineageos.org/legal|https://divestos.xyz/index.php?page=privacy_policy|' src/org/lineageos/setupwizard/LineageSettingsActivity.java; sed -i '/.*setup_services/s/LineageOS/'"$REBRAND_NAME"'/' res/values*/strings.xml; sed -i '/.*services_explanation/s/LineageOS/'"$REBRAND_NAME"'/' res/values*/strings.xml; -cp "$patches/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours +cp "$patchesCommon/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours enter "packages/apps/Updater"; sed -i 's|>LineageOS|>'"$REBRAND_NAME"'|' res/values*/strings.xml;