summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/dashboard
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-05-01 17:29:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-01 17:29:48 +0000
commitdbf094128c821cc3d153872c12c9bc1740011057 (patch)
treebbea5855a70f00d51bd39db5bf52581656d48ed1 /src/com/android/settings/dashboard
parent40a6217fe138dc6c75ce94c1203fbf3fb0fe95cb (diff)
parent603b8b6356789c1401d1451a0efd596fd89e8c26 (diff)
downloadpackages_apps_Settings-dbf094128c821cc3d153872c12c9bc1740011057.zip
packages_apps_Settings-dbf094128c821cc3d153872c12c9bc1740011057.tar.gz
packages_apps_Settings-dbf094128c821cc3d153872c12c9bc1740011057.tar.bz2
Merge "Add a CREATOR in DashboardCategory to support Parcelable"
Diffstat (limited to 'src/com/android/settings/dashboard')
-rw-r--r--src/com/android/settings/dashboard/DashboardCategory.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/com/android/settings/dashboard/DashboardCategory.java b/src/com/android/settings/dashboard/DashboardCategory.java
index 2d08599..164d988 100644
--- a/src/com/android/settings/dashboard/DashboardCategory.java
+++ b/src/com/android/settings/dashboard/DashboardCategory.java
@@ -19,6 +19,7 @@ package com.android.settings.dashboard;
import android.content.res.Resources;
import android.os.Parcel;
import android.os.Parcelable;
+import android.os.Parcelable.Creator;
import android.text.TextUtils;
import java.util.ArrayList;
@@ -127,4 +128,18 @@ public class DashboardCategory implements Parcelable {
tiles.add(tile);
}
}
+
+ DashboardCategory(Parcel in) {
+ readFromParcel(in);
+ }
+
+ public static final Creator<DashboardCategory> CREATOR = new Creator<DashboardCategory>() {
+ public DashboardCategory createFromParcel(Parcel source) {
+ return new DashboardCategory(source);
+ }
+
+ public DashboardCategory[] newArray(int size) {
+ return new DashboardCategory[size];
+ }
+ };
}