Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
diff --git a/res/layout/support_offline_escalation_options.xml b/res/layout/support_offline_escalation_options.xml
index 4f6940c..6a54fba 100644
--- a/res/layout/support_offline_escalation_options.xml
+++ b/res/layout/support_offline_escalation_options.xml
@@ -64,5 +64,6 @@
style="@style/SupportSecondaryButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:minHeight="48dp"/>
+ android:minHeight="48dp"
+ android:visibility="gone"/>
</LinearLayout>
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index ecf6497..ca68a74 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -15,7 +15,6 @@
*/
package com.android.settings.dashboard;
-import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
@@ -110,21 +109,6 @@
return mSuggestions;
}
- public Tile getTile(ComponentName component) {
- if (mCategories == null) {
- return null;
- }
- for (int i = 0; i < mCategories.size(); i++) {
- for (int j = 0; j < mCategories.get(i).tiles.size(); j++) {
- Tile tile = mCategories.get(i).tiles.get(j);
- if (component.equals(tile.intent.getComponent())) {
- return tile;
- }
- }
- }
- return null;
- }
-
public void setCategoriesAndSuggestions(List<DashboardCategory> categories,
List<Tile> suggestions) {
mSuggestions = suggestions;
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index 778d620..4232852 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -28,8 +28,10 @@
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;
+
import com.android.settings.SettingsActivity;
import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.SettingsDrawerActivity;
import com.android.settingslib.drawer.Tile;
import java.lang.reflect.Field;
@@ -87,9 +89,24 @@
public void run() {
// Since tiles are not always cached (like on locale change for instance),
// we need to always get the latest one.
- Tile tile = mAdapter.getTile(component);
- if (tile == null) return;
- if (DEBUG) Log.d(TAG, "setSummary " + tile.title + " - " + summary);
+ if (!(mActivity instanceof SettingsDrawerActivity)) {
+ if (DEBUG) {
+ Log.d(TAG, "Can't get category list.");
+ }
+ return;
+ }
+ final List<DashboardCategory> categories =
+ ((SettingsDrawerActivity) mActivity).getDashboardCategories();
+ final Tile tile = getTileFromCategory(categories, component);
+ if (tile == null) {
+ if (DEBUG) {
+ Log.d(TAG, "Can't find tile for " + component);
+ }
+ return;
+ }
+ if (DEBUG) {
+ Log.d(TAG, "setSummary " + tile.title + " - " + summary);
+ }
tile.summary = summary;
mAdapter.notifyChanged(tile);
}
@@ -187,6 +204,27 @@
}
}
+ private Tile getTileFromCategory(List<DashboardCategory> categories, ComponentName component) {
+ if (categories == null) {
+ if (DEBUG) {
+ Log.d(TAG, "Category is null, can't find tile");
+ }
+ return null;
+ }
+ final int categorySize = categories.size();
+ for (int i = 0; i < categorySize; i++) {
+ final DashboardCategory category = categories.get(i);
+ final int tileCount = category.tiles.size();
+ for (int j = 0; j < tileCount; j++) {
+ final Tile tile = category.tiles.get(j);
+ if (component.equals(tile.intent.getComponent())) {
+ return tile;
+ }
+ }
+ }
+ return null;
+ }
+
public interface SummaryProvider {
void setListening(boolean listening);
}