Skip to content

Commit

Permalink
Update patches
Browse files Browse the repository at this point in the history
Change URL to Modaco thread

Change-Id: I6fc6439a115a4dc7378462914730428b96274ca5
  • Loading branch information
grigorig committed Mar 17, 2013
1 parent 1edd466 commit 5077e40
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 59 deletions.
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
From ed4fe1919818eebc7269f04f3a9a128e28ff5373 Mon Sep 17 00:00:00 2001
From 9ba770b8a6c9f2923d28d4a77581b8db93292e2f Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Mon, 23 Jul 2012 12:53:13 +0300
Subject: [PATCH 01/10] add option to display navigation bar (2/2)
Subject: [PATCH 1/7] add option to display navigation bar (2/2)

Change-Id: I1801d7d15cbf68d4883168bf7259c13f52a256a5
---
res/values/strings.xml | 7 +++
res/xml/system_settings.xml | 6 +++
.../settings/cyanogenmod/SystemSettings.java | 45 ++++++++++++++++++++
res/values/strings.xml | 7 ++++
res/xml/system_settings.xml | 6 +++
.../settings/cyanogenmod/SystemSettings.java | 45 ++++++++++++++++++++++
3 files changed, 58 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b782a34..45c79ee 100644
index 5931dae..8e9c11d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4969,5 +4969,12 @@
<string name="gestures_action_search">Invoke Search</string>
<string name="gestures_action_recent">Recent Applications</string>
@@ -4978,5 +4978,12 @@
<string name="gestures_action_search">Invoke search</string>
<string name="gestures_action_recent">Recent applications</string>

+ <!-- Navbar -->
+ <string name="konsta_navbar">Show navigation bar</string>
Expand Down Expand Up @@ -133,5 +133,5 @@ index e7ee4b2..a174b67 100644
final String key = preference.getKey();
if (KEY_FONT_SIZE.equals(key)) {
--
1.7.9.5
1.8.2

Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
From 847335f54b7c451cf3b067381be0709024ed21d9 Mon Sep 17 00:00:00 2001
From d6cfe33abbef8f6ceeaffd7c52db720e9dd1f916 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Mon, 23 Jul 2012 13:01:50 +0300
Subject: [PATCH 02/10] add forum link to device info
Subject: [PATCH 2/7] add forum link to device info

Change-Id: I7963debc77ee01d34bd73a5a5626edfbb0d81836
---
res/values/strings.xml | 5 +++++
res/xml/device_info_settings.xml | 5 +++++
src/com/android/settings/DeviceInfoSettings.java | 13 +++++++++++++
res/values/strings.xml | 5 +++++
res/xml/device_info_settings.xml | 5 +++++
src/com/android/settings/DeviceInfoSettings.java | 13 +++++++++++++
3 files changed, 23 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 45c79ee..4c8a404 100644
index 8e9c11d..feba456 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4976,5 +4976,10 @@
@@ -4985,5 +4985,10 @@
<string name="konsta_navbar_dialog_msg">Please reboot to enable/disable the navigation bar</string>
<string name="konsta_navbar_dialog_negative">Reboot later</string>
<string name="konsta_navbar_dialog_positive">Hot reboot now</string>
+
+ <!-- Konsta forum link -->
+ <string name="konsta_web_title">CyanogenMod 10 - KonstaKANG</string>
+ <string name="konsta_web_title">CyanogenMod 10 by daemond</string>
+ <string name="konsta_web_summary">Visit MoDaCo thread</string>
+ <string name="konsta_web_url">http://www.modaco.com/topic/355903-devrom-cyanogenmod-10-android-411/</string>
+ <string name="konsta_web_url">http://www.modaco.com/topic/360395-devrom262-cyanogenmod-10-continuation-of-konstats-work/</string>
<!-- **** CYANOGENMOD ADDITIONS END **** -->
</resources>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
Expand Down Expand Up @@ -74,5 +74,5 @@ index 29b35a5..05e5d91 100644

@Override
--
1.7.9.5
1.8.2

Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
From 9d83d90224b1efddfcfa34ba49786565a133ba18 Mon Sep 17 00:00:00 2001
From dbc7190cd207265d179f99f0bd7e4de77e73bc25 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Mon, 23 Jul 2012 14:09:59 +0300
Subject: [PATCH 03/10] add option to disable bootanimation
Subject: [PATCH 3/7] add option to disable bootanimation

Change-Id: Ie694fed4f8e5733d8d36a7bb406967c4ee65de64
---
res/values/strings.xml | 4 ++++
res/xml/performance_settings.xml | 5 +++++
.../settings/cyanogenmod/PerformanceSettings.java | 13 +++++++++++++
res/values/strings.xml | 4 ++++
res/xml/performance_settings.xml | 5 +++++
.../android/settings/cyanogenmod/PerformanceSettings.java | 13 +++++++++++++
3 files changed, 22 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4c8a404..47d6efb 100644
index feba456..404b857 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4981,5 +4981,9 @@
<string name="konsta_web_title">CyanogenMod 10 - KonstaKANG</string>
@@ -4990,5 +4990,9 @@
<string name="konsta_web_title">CyanogenMod 10 by daemond</string>
<string name="konsta_web_summary">Visit MoDaCo thread</string>
<string name="konsta_web_url">http://www.modaco.com/topic/355903-devrom-cyanogenmod-10-android-411/</string>
<string name="konsta_web_url">http://www.modaco.com/topic/360395-devrom262-cyanogenmod-10-continuation-of-konstats-work/</string>
+
+ <!-- Performance : Disable bootanimation -->
+ <string name="pref_disable_bootanimation_title">Disable boot animation</string>
Expand All @@ -39,7 +39,7 @@ index 8644a70..547e41a 100644
+
</PreferenceScreen>
diff --git a/src/com/android/settings/cyanogenmod/PerformanceSettings.java b/src/com/android/settings/cyanogenmod/PerformanceSettings.java
index 0c100e5..f6130a5 100644
index bfcbdee..df17102 100644
--- a/src/com/android/settings/cyanogenmod/PerformanceSettings.java
+++ b/src/com/android/settings/cyanogenmod/PerformanceSettings.java
@@ -45,10 +45,16 @@ public class PerformanceSettings extends SettingsPreferenceFragment
Expand Down Expand Up @@ -70,7 +70,7 @@ index 0c100e5..f6130a5 100644
/* Display the warning dialog */
alertDialog = new AlertDialog.Builder(getActivity()).create();
alertDialog.setTitle(R.string.performance_settings_warning_title);
@@ -92,6 +102,9 @@ public class PerformanceSettings extends SettingsPreferenceFragment
@@ -97,6 +107,9 @@ public class PerformanceSettings extends SettingsPreferenceFragment
if (preference == mUse16bppAlphaPref) {
SystemProperties.set(USE_16BPP_ALPHA_PROP,
mUse16bppAlphaPref.isChecked() ? "1" : "0");
Expand All @@ -81,5 +81,5 @@ index 0c100e5..f6130a5 100644
// If we didn't handle it, let preferences handle it.
return super.onPreferenceTreeClick(preferenceScreen, preference);
--
1.7.9.5
1.8.2

20 changes: 10 additions & 10 deletions patches/packages_apps_Settings/0004-add-partition-info.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From ea26094150b0a0493087fb35af57a6ebda5f7616 Mon Sep 17 00:00:00 2001
From 7e2cababd5ee462896470039aa262aac47a381c4 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Tue, 24 Jul 2012 11:04:32 +0300
Subject: [PATCH 04/10] add partition info
Subject: [PATCH 4/7] add partition info

Change-Id: I2abea99edc9765d898536b19ad9159fe3ed4e9b6
---
AndroidManifest.xml | 9 ++
res/values/strings.xml | 8 ++
res/xml/partition_info.xml | 39 ++++++++
res/xml/settings_headers.xml | 10 +++
src/com/android/settings/PartitionInfo.java | 127 +++++++++++++++++++++++++++
AndroidManifest.xml | 9 ++
res/values/strings.xml | 8 ++
res/xml/partition_info.xml | 39 +++++++++
res/xml/settings_headers.xml | 10 +++
src/com/android/settings/PartitionInfo.java | 127 ++++++++++++++++++++++++++++
5 files changed, 193 insertions(+)
create mode 100644 res/xml/partition_info.xml
create mode 100644 src/com/android/settings/PartitionInfo.java
Expand All @@ -35,10 +35,10 @@ index ac790fd..819d52d 100644
android:label="@string/location_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 47d6efb..d6886d1 100644
index 404b857..fd41631 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4985,5 +4985,13 @@
@@ -4994,5 +4994,13 @@
<!-- Performance : Disable bootanimation -->
<string name="pref_disable_bootanimation_title">Disable boot animation</string>
<string name="pref_disable_bootanimation_summary">Don\'t show the boot animation for faster boot</string>
Expand Down Expand Up @@ -252,5 +252,5 @@ index 0000000..6020be2
+ }
+}
--
1.7.9.5
1.8.2

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From cc519a9b9dbd9f673192c79216244fac4fa654b9 Mon Sep 17 00:00:00 2001
From 56c159c1f4cf54143d178dd38f00774192c61259 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Fri, 27 Jul 2012 15:11:18 +0300
Subject: [PATCH 05/10] re-organize system settings menu
Subject: [PATCH 5/7] re-organize system settings menu

Change-Id: Idefc4bfb6a18b958308b8a83bfcbd22bf2dcf8bc
---
res/xml/system_settings.xml | 20 ++++++++++----------
res/xml/system_settings.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/xml/system_settings.xml b/res/xml/system_settings.xml
Expand Down Expand Up @@ -51,5 +51,5 @@ index d566485..d6c87f2 100644
android:key="konsta_navbar"
android:title="@string/konsta_navbar"
--
1.7.9.5
1.8.2

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 595f005284661323e6cc088a75cd270286c21c81 Mon Sep 17 00:00:00 2001
From 4ce875a83f352bf6cb1e2bf226e253228f4de4ea Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Wed, 19 Sep 2012 23:49:43 +0300
Subject: [PATCH 06/10] don't hide hardware keys option when navbar enabled
Subject: [PATCH 6/7] don't hide hardware keys option when navbar enabled

Change-Id: I0539f167d17b941d7bb72238ca291d81fdab58b2
---
.../settings/cyanogenmod/SystemSettings.java | 5 -----
src/com/android/settings/cyanogenmod/SystemSettings.java | 5 -----
1 file changed, 5 deletions(-)

diff --git a/src/com/android/settings/cyanogenmod/SystemSettings.java b/src/com/android/settings/cyanogenmod/SystemSettings.java
Expand All @@ -25,5 +25,5 @@ index a174b67..c7b9e98 100644
} catch (RemoteException e) {
}
--
1.7.9.5
1.8.2

18 changes: 9 additions & 9 deletions patches/packages_apps_Settings/0007-add-battery-bar-2-2.patch
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
From 7adc62672e6dac4502c93e7cdc2d6bdb3ce872e6 Mon Sep 17 00:00:00 2001
From b57b53f05e714b68d8498c6011562f3df80150f1 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Thu, 5 Jul 2012 00:51:19 +0300
Subject: [PATCH 10/10] add battery bar (2/2)
Subject: [PATCH 7/7] add battery bar (2/2)

Change-Id: I3d582ba787721970ef2f973fac220ecc070b00b7
---
res/values/arrays.xml | 2 ++
res/values/strings.xml | 1 +
res/values/arrays.xml | 2 ++
res/values/strings.xml | 1 +
2 files changed, 3 insertions(+)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6c005ca..8d1730d 100644
index ab4a2f7..1000819 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1036,6 +1036,7 @@
@@ -1024,6 +1024,7 @@
<item>@string/status_bar_battery_status_percentage</item>
<item>@string/status_bar_battery_status_circle</item>
<item>@string/status_bar_battery_status_circle_percentage</item>
+ <item>@string/status_bar_battery_status_statusbar</item>
<item>@string/status_bar_style_hidden</item>
</string-array>

@@ -1044,6 +1045,7 @@
@@ -1032,6 +1033,7 @@
<item>1</item>
<item>2</item>
<item>3</item>
Expand All @@ -30,7 +30,7 @@ index 6c005ca..8d1730d 100644
</string-array>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 438522b..6179e14 100644
index fd41631..f259255 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4414,6 +4414,7 @@
Expand All @@ -42,5 +42,5 @@ index 438522b..6179e14 100644
<string name="lock_screen_title">Lock screen</string>

--
1.7.9.5
1.8.2

2 comments on commit 5077e40

@C3C0
Copy link

@C3C0 C3C0 commented on 5077e40 Mar 18, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi.
Regarding PartitionInfo. Here is my patch for slightly better SD-EXT mountpoint handling.
https://github.com/ParanoidZTE/android_packages_apps_Settings/commit/37c74fd604bdebf45a8546dd7efb405884c33214

@grigorig
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is useful, thanks for the hint. :)

Please sign in to comment.