commit 7c905783858ebf079028fec708fc3714833daa9b
author Eric Fischer <enf@google.com> Fri Apr 20 14:27:19 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 20 14:27:19 2012 -0700
tree 80b765ef39457477a2e96fd1ea89589d01bcba7a
parent a04dccb5aacb4b7a243219371f842ae2778310f6
parent b3e458a3da372b381aef5b042de9b3baecac4951

Merge "Import translations. DO NOT MERGE"

src/com/android/settings/AccessibilitySettings.java

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 29be510..f298447 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -184,7 +184,7 @@
         if (mServicesCategory.getPreference(0) == mNoServicesMessagePreference) {
             offerInstallAccessibilitySerivceOnce();
         }
-        mSettingsPackageMonitor.register(getActivity(), false);
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
     }
 
     @Override

src/com/android/settings/widget/ChartDataUsageView.java

diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
index c07509c..f8e6587 100644
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -625,10 +625,8 @@
                 resultRounded = unitFactor * Math.round(result);
             }
 
-            final int[] sizeBounds = findOrCreateSpan(builder, sSpanSize, "^1");
-            builder.replace(sizeBounds[0], sizeBounds[1], size);
-            final int[] unitBounds = findOrCreateSpan(builder, sSpanUnit, "^2");
-            builder.replace(unitBounds[0], unitBounds[1], unit);
+            setText(builder, sSpanSize, size, "^1");
+            setText(builder, sSpanUnit, unit, "^2");
 
             return (long) resultRounded;
         }
@@ -663,16 +661,26 @@
         }
     }
 
-    private static int[] findOrCreateSpan(
-            SpannableStringBuilder builder, Object key, CharSequence bootstrap) {
+    private static void setText(
+            SpannableStringBuilder builder, Object key, CharSequence text, String bootstrap) {
         int start = builder.getSpanStart(key);
         int end = builder.getSpanEnd(key);
         if (start == -1) {
             start = TextUtils.indexOf(builder, bootstrap);
             end = start + bootstrap.length();
             builder.setSpan(key, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+
+            // Fix the AbsoluteSizeSpan created from html. Its flags must be set to
+            // SPAN_INCLUSIVE_INCLUSIVE so that it survives a removal of its entire content
+            Object[] spans = builder.getSpans(start, end, Object.class);
+            for (int i = 0; i < spans.length; i++) {
+                Object span = spans[i];
+                if (builder.getSpanStart(span) == start && builder.getSpanEnd(span) == end) {
+                    builder.setSpan(span, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+                }
+            }
         }
-        return new int[] { start, end };
+        builder.replace(start, end, text);
     }
 
     private static long roundUpToPowerOfTwo(long i) {