Merge "Accessibility settings - divider should be hidden"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1e12a67..55fa851 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -373,16 +373,12 @@
</intent-filter>
</activity>
- <activity android:name=".inputmethod.InputMethodDialogActivity"
- android:clearTaskOnLaunch="true">
+ <receiver android:name=".inputmethod.InputMethodDialogReceiver"
+ android:enabled="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
- <category android:name="android.intent.category.VOICE_LAUNCH" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- </activity>
+ </receiver>
<activity android:name="Settings$UserDictionarySettingsActivity"
android:label="@string/user_dict_settings_titlebar"
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index bed3be5..4edda7d 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -745,9 +745,13 @@
long start = currentTime;
long end = currentTime;
- if (history.bucketCount > 0) {
- start = history.bucketStart[0];
- end = history.bucketStart[history.bucketCount - 1];
+
+ NetworkStatsHistory.Entry entry = null;
+ if (history.size() > 0) {
+ entry = history.getValues(0, entry);
+ start = entry.bucketStart;
+ entry = history.getValues(history.size() - 1, entry);
+ end = entry.bucketStart + entry.bucketDuration;
}
return new long[] { start, end };
@@ -1081,11 +1085,12 @@
mItems.clear();
if (stats != null) {
- for (int i = 0; i < stats.size; i++) {
- final long total = stats.rx[i] + stats.tx[i];
+ NetworkStats.Entry entry = null;
+ for (int i = 0; i < stats.size(); i++) {
+ entry = stats.getValues(i, entry);
final AppUsageItem item = new AppUsageItem();
- item.uid = stats.uid[i];
- item.total = total;
+ item.uid = entry.uid;
+ item.total = entry.rxBytes + entry.txBytes;
mItems.add(item);
}
}
diff --git a/src/com/android/settings/inputmethod/InputMethodDialogActivity.java b/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
similarity index 62%
rename from src/com/android/settings/inputmethod/InputMethodDialogActivity.java
rename to src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
index 4efbf05..46be132 100644
--- a/src/com/android/settings/inputmethod/InputMethodDialogActivity.java
+++ b/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
@@ -15,17 +15,18 @@
*/
package com.android.settings.inputmethod;
-import android.app.Activity;
+import android.content.BroadcastReceiver;
import android.content.Context;
-import android.os.Bundle;
+import android.content.Intent;
+import android.provider.Settings;
import android.view.inputmethod.InputMethodManager;
-public class InputMethodDialogActivity extends Activity {
+public class InputMethodDialogReceiver extends BroadcastReceiver {
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE)).
- showInputMethodPicker();
- finish();
+ public void onReceive(Context context, Intent intent) {
+ if (Settings.ACTION_SHOW_INPUT_METHOD_PICKER.equals(intent.getAction())) {
+ ((InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE))
+ .showInputMethodPicker();
+ }
}
}
diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java
index 83c10cd..10d8976 100644
--- a/src/com/android/settings/widget/ChartNetworkSeriesView.java
+++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java
@@ -140,7 +140,7 @@
mPathFill.reset();
// bail when not enough stats to render
- if (mStats == null || mStats.bucketCount < 2) return;
+ if (mStats == null || mStats.size() < 2) return;
final int width = getWidth();
final int height = getHeight();
@@ -155,8 +155,11 @@
long totalData = 0;
- for (int i = 0; i < mStats.bucketCount; i++) {
- final float x = mHoriz.convertToPoint(mStats.bucketStart[i]);
+ NetworkStatsHistory.Entry entry = null;
+ for (int i = 0; i < mStats.size(); i++) {
+ entry = mStats.getValues(i, entry);
+
+ final float x = mHoriz.convertToPoint(entry.bucketStart);
final float y = mVert.convertToPoint(totalData);
// skip until we find first stats on screen
@@ -170,7 +173,7 @@
if (started) {
mPathStroke.lineTo(x, y);
mPathFill.lineTo(x, y);
- totalData += mStats.rx[i] + mStats.tx[i];
+ totalData += entry.rxBytes + entry.txBytes;
}
// skip if beyond view