From 5ed4ae346ee91e1f58bb604355ecef74dd33cb01 Mon Sep 17 00:00:00 2001
From: KalimochoAz <calimochoazucarado@gmail.com>
Date: Tue, 1 May 2012 22:17:10 +0200
Subject: Revert "Add control for fast USB Charge"

This reverts commit 8f1496f742f27fc1fd20852710c9d7146e5fae16.

According to an internal team talk we decide to revert this due to the possibility
that USB devices that not meet the standards can damage user devices and produce
battery issues.

It is clear the the problem will be produces by the bad USB device/HUB... but the
advantages of this patch compairing with the risk makes us to belive that this is
not a good idea
---
 GNexusParts/res/values-de/strings.xml       | 2 +-
 GNexusParts/res/values-ja/strings.xml       | 2 +-
 GNexusParts/res/values-ru/strings.xml       | 1 +
 GNexusParts/res/values/strings.xml          | 6 ++----
 GNexusParts/res/xml/general_preferences.xml | 8 ++------
 5 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'GNexusParts/res')

diff --git a/GNexusParts/res/values-de/strings.xml b/GNexusParts/res/values-de/strings.xml
index e5e4826..ed03759 100644
--- a/GNexusParts/res/values-de/strings.xml
+++ b/GNexusParts/res/values-de/strings.xml
@@ -6,7 +6,7 @@
     <string name="general_title">ALLGEMEIN</string>
     <string name="display_title">BILDSCHIRM</string>
 
-    <string name="category_system_title">System</string>
+    <string name="category_cpu_title">Prozessor</string>
     <string name="category_screen_title">WM8994 Einstellungen ( voodoo )</string>
     <string name="color_tuning_title_head">Farbmultiplikator</string>
     <string name="color_tuning_summary_head">Farbmultiplikator einstellen</string>
diff --git a/GNexusParts/res/values-ja/strings.xml b/GNexusParts/res/values-ja/strings.xml
index 6a650f3..357a2d8 100644
--- a/GNexusParts/res/values-ja/strings.xml
+++ b/GNexusParts/res/values-ja/strings.xml
@@ -6,7 +6,7 @@
     <string name="general_title">一般</string>
     <string name="display_title">ディスプレイ</string>
 
-    <string name="category_system_title">SYSTEM</string>
+    <string name="category_cpu_title">CPU</string>
     <string name="category_screen_title">WM8994設定 ( voodoo )</string>
     <string name="color_tuning_title_head">カラーマルチプライヤチューニング</string>
     <string name="color_tuning_summary_head">画面の色味を調整する</string>
diff --git a/GNexusParts/res/values-ru/strings.xml b/GNexusParts/res/values-ru/strings.xml
index 57fc0ca..cd76fca 100644
--- a/GNexusParts/res/values-ru/strings.xml
+++ b/GNexusParts/res/values-ru/strings.xml
@@ -6,6 +6,7 @@
     <string name="general_title">ОСНОВНЫЕ</string>
     <string name="display_title">ДИСПЛЕЙ</string>
 
+    <string name="category_cpu_title">ЦП</string>
     <string name="category_screen_title">Настройки WM8994 ( voodoo )</string>
     <string name="color_tuning_title_head">Настройка цвета мультипликатора</string>
     <string name="color_tuning_summary_head">Калибровка цвета мультипликатора</string>
diff --git a/GNexusParts/res/values/strings.xml b/GNexusParts/res/values/strings.xml
index f06093f..43f27a5 100644
--- a/GNexusParts/res/values/strings.xml
+++ b/GNexusParts/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="general_title">GENERAL</string>
     <string name="display_title">DISPLAY</string>
 
-    <string name="category_system_title">System</string>
+    <string name="category_cpu_title">CPU</string>
     <string name="category_screen_title">WM8994 Settings ( voodoo )</string>
     <string name="color_tuning_title_head">Color Multipliers Tuning</string>
     <string name="color_tuning_summary_head">Calibrate multipliers screen color</string>
@@ -23,8 +23,6 @@
     <string name="color_default_title">Default</string>
     <string name="color_CM_title">CM Sett.</string>
     <string name="color_dark_title">Dark Sett.</string>
-    <string name="usb_fastcharge_title_head">Fast charge USB</string>
-    <string name="usb_fastcharge_summary_head">Fast charge when connected to computer USB interface</string>
 
     <string name="preset1_default_title">Default.</string>
     <string name="preset2_default_title">Natural</string>
@@ -32,7 +30,7 @@
     <string name="preset4_default_title">Warm</string>
     <string name="preset5_default_title">Dark Cold</string>
     <string name="preset6_default_title">Cross Proc.</string>
-    <string name="credits_presets">Credits: ale.landra91 cpaixao malycomix</string>
+    <string name="credits_presets">Credits: ale.landra91 cpaixao provolinoo</string>
 
     <string name="category_touchkey_title">Touch Keys</string>
     <string name="touchkey_notification_title_head">Backlight Notifications</string>
diff --git a/GNexusParts/res/xml/general_preferences.xml b/GNexusParts/res/xml/general_preferences.xml
index 2bf2c43..fc07c42 100644
--- a/GNexusParts/res/xml/general_preferences.xml
+++ b/GNexusParts/res/xml/general_preferences.xml
@@ -2,12 +2,8 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- General settings -->
-    <PreferenceCategory android:key="category_system"
-        android:title="@string/category_system_title">
-
-        <CheckBoxPreference android:key="fast_charge_usb"
-            android:title="@string/usb_fastcharge_title_head"
-            android:summary="@string/usb_fastcharge_summary_head" />
+    <PreferenceCategory android:key="category_cpu"
+        android:title="@string/category_cpu_title">
 
     </PreferenceCategory>
 
-- 
cgit v1.1