summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-05-26 23:40:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-26 23:40:06 +0000
commit5c93eac3ae163a5a3d866db24d9b853caa9b9f88 (patch)
tree1689db2cc2cc658b167dcfdca5f214b9128427ea
parent3c62137adf79673abb5400da7e310df11f61c932 (diff)
parent9600d20110861db08f0db21358161dc0ae6b2037 (diff)
downloadandroid_packages_apps_Trebuchet-5c93eac3ae163a5a3d866db24d9b853caa9b9f88.tar.gz
android_packages_apps_Trebuchet-5c93eac3ae163a5a3d866db24d9b853caa9b9f88.tar.bz2
android_packages_apps_Trebuchet-5c93eac3ae163a5a3d866db24d9b853caa9b9f88.zip
Merge "Adding a loading view for widgets list" into ub-launcher3-calgary
-rw-r--r--res/layout/widgets_view.xml6
-rw-r--r--src/com/android/launcher3/widget/WidgetsContainerView.java6
2 files changed, 12 insertions, 0 deletions
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml
index e55f6f085..0503466de 100644
--- a/res/layout/widgets_view.xml
+++ b/res/layout/widgets_view.xml
@@ -49,6 +49,12 @@
android:theme="@style/CustomOverscroll.Dark"
android:layout_width="match_parent"
android:layout_height="match_parent" />
+
+ <ProgressBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/loader"
+ android:layout_gravity="center" />
</FrameLayout>
diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java
index 23d04331f..a76f0af66 100644
--- a/src/com/android/launcher3/widget/WidgetsContainerView.java
+++ b/src/com/android/launcher3/widget/WidgetsContainerView.java
@@ -26,6 +26,7 @@ import android.support.v7.widget.RecyclerView.State;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
+import android.view.ViewGroup;
import android.widget.Toast;
import com.android.launcher3.BaseContainerView;
@@ -329,6 +330,11 @@ public class WidgetsContainerView extends BaseContainerView
mRecyclerView.setWidgets(model);
mAdapter.setWidgetsModel(model);
mAdapter.notifyDataSetChanged();
+
+ View loader = getContentView().findViewById(R.id.loader);
+ if (loader != null) {
+ ((ViewGroup) getContentView()).removeView(loader);
+ }
}
public boolean isEmpty() {