Merge "Adding a loading view for widgets list" into ub-launcher3-calgary
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml
index e55f6f0..0503466 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 23d0433..a76f0af 100644
--- a/src/com/android/launcher3/widget/WidgetsContainerView.java
+++ b/src/com/android/launcher3/widget/WidgetsContainerView.java
@@ -26,6 +26,7 @@
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 @@
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() {