Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java
index b8290fc..a836fb3 100644
--- a/src/com/android/settings/deviceinfo/UsbSettings.java
+++ b/src/com/android/settings/deviceinfo/UsbSettings.java
@@ -123,7 +123,6 @@
mMtp.setEnabled(false);
mPtp.setEnabled(false);
}
-
}
@Override
@@ -134,22 +133,17 @@
if (Utils.isMonkeyRunning()) {
return true;
}
- // temporary hack - using check boxes as radio buttons
- // don't allow unchecking them
- if (preference instanceof CheckBoxPreference) {
- CheckBoxPreference checkBox = (CheckBoxPreference)preference;
- if (!checkBox.isChecked()) {
- checkBox.setChecked(true);
- return true;
- }
+
+ String function = "none";
+ if (preference == mMtp && mMtp.isChecked()) {
+ function = UsbManager.USB_FUNCTION_MTP;
+ } else if (preference == mPtp && mPtp.isChecked()) {
+ function = UsbManager.USB_FUNCTION_PTP;
}
- if (preference == mMtp) {
- mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP, true);
- updateToggles(UsbManager.USB_FUNCTION_MTP);
- } else if (preference == mPtp) {
- mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP, true);
- updateToggles(UsbManager.USB_FUNCTION_PTP);
- }
+
+ mUsbManager.setCurrentFunction(function, true);
+ updateToggles(function);
+
return true;
}
}
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index a229888..5145789 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -557,77 +557,77 @@
lastX = x;
lastY = y;
}
+ }
- final boolean charging =
- (rec.states&HistoryItem.STATE_BATTERY_PLUGGED_FLAG) != 0;
- if (charging != lastCharging) {
- if (charging) {
- mChargingPath.moveTo(x, h-mChargingOffset);
- } else {
- mChargingPath.lineTo(x, h-mChargingOffset);
- }
- lastCharging = charging;
+ final boolean charging =
+ (rec.states&HistoryItem.STATE_BATTERY_PLUGGED_FLAG) != 0;
+ if (charging != lastCharging) {
+ if (charging) {
+ mChargingPath.moveTo(x, h-mChargingOffset);
+ } else {
+ mChargingPath.lineTo(x, h-mChargingOffset);
}
+ lastCharging = charging;
+ }
- final boolean screenOn =
- (rec.states&HistoryItem.STATE_SCREEN_ON_FLAG) != 0;
- if (screenOn != lastScreenOn) {
- if (screenOn) {
- mScreenOnPath.moveTo(x, h-mScreenOnOffset);
- } else {
- mScreenOnPath.lineTo(x, h-mScreenOnOffset);
- }
- lastScreenOn = screenOn;
+ final boolean screenOn =
+ (rec.states&HistoryItem.STATE_SCREEN_ON_FLAG) != 0;
+ if (screenOn != lastScreenOn) {
+ if (screenOn) {
+ mScreenOnPath.moveTo(x, h-mScreenOnOffset);
+ } else {
+ mScreenOnPath.lineTo(x, h-mScreenOnOffset);
}
+ lastScreenOn = screenOn;
+ }
- final boolean gpsOn =
- (rec.states&HistoryItem.STATE_GPS_ON_FLAG) != 0;
- if (gpsOn != lastGpsOn) {
- if (gpsOn) {
- mGpsOnPath.moveTo(x, h-mGpsOnOffset);
- } else {
- mGpsOnPath.lineTo(x, h-mGpsOnOffset);
- }
- lastGpsOn = gpsOn;
+ final boolean gpsOn =
+ (rec.states&HistoryItem.STATE_GPS_ON_FLAG) != 0;
+ if (gpsOn != lastGpsOn) {
+ if (gpsOn) {
+ mGpsOnPath.moveTo(x, h-mGpsOnOffset);
+ } else {
+ mGpsOnPath.lineTo(x, h-mGpsOnOffset);
}
+ lastGpsOn = gpsOn;
+ }
- final boolean wifiRunning =
- (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
- if (wifiRunning != lastWifiRunning) {
- if (wifiRunning) {
- mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
- } else {
- mWifiRunningPath.lineTo(x, h-mWifiRunningOffset);
- }
- lastWifiRunning = wifiRunning;
+ final boolean wifiRunning =
+ (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
+ if (wifiRunning != lastWifiRunning) {
+ if (wifiRunning) {
+ mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
+ } else {
+ mWifiRunningPath.lineTo(x, h-mWifiRunningOffset);
}
+ lastWifiRunning = wifiRunning;
+ }
- final boolean wakeLock =
- (rec.states&HistoryItem.STATE_WAKE_LOCK_FLAG) != 0;
- if (wakeLock != lastWakeLock) {
- if (wakeLock) {
- mWakeLockPath.moveTo(x, h-mWakeLockOffset);
- } else {
- mWakeLockPath.lineTo(x, h-mWakeLockOffset);
- }
- lastWakeLock = wakeLock;
+ final boolean wakeLock =
+ (rec.states&HistoryItem.STATE_WAKE_LOCK_FLAG) != 0;
+ if (wakeLock != lastWakeLock) {
+ if (wakeLock) {
+ mWakeLockPath.moveTo(x, h-mWakeLockOffset);
+ } else {
+ mWakeLockPath.lineTo(x, h-mWakeLockOffset);
}
+ lastWakeLock = wakeLock;
+ }
- if (mLargeMode && mHavePhoneSignal) {
- int bin;
- if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
- >> HistoryItem.STATE_PHONE_STATE_SHIFT)
- == ServiceState.STATE_POWER_OFF) {
- bin = 0;
- } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
- bin = 1;
- } else {
- bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
- >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
- bin += 2;
- }
- mPhoneSignalChart.addTick(x, bin);
+ if (mLargeMode && mHavePhoneSignal) {
+ int bin;
+ if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
+ >> HistoryItem.STATE_PHONE_STATE_SHIFT)
+ == ServiceState.STATE_POWER_OFF) {
+ bin = 0;
+ } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
+ bin = 1;
+ } else {
+ bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
+ >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
+ bin += 2;
}
+ mPhoneSignalChart.addTick(x, bin);
}
} else if (rec.cmd != BatteryStats.HistoryItem.CMD_OVERFLOW) {