From 863bd52976530357bcadcab0fb59887f8210520f Mon Sep 17 00:00:00 2001
From: Byunghun Jeon <bjeon@codeaurora.org>
Date: Mon, 2 Nov 2015 17:20:55 -0800
Subject: Gallery2: add loading progress dialog for FilterShowActivity

Add a progress dialog to limit access to dual cam filters until after
DDM is successfully loaded. Dual camera filter category will be
hidden by default until DDM is loaded and verified.

Conflicts:
        res/layout/filtershow_activity.xml
        res/layout/filtershow_main_panel.xml
        src/com/android/gallery3d/filtershow/category/MainPanel.java

CRs-Fixed: 929338
Change-Id: I9602c3fb31da37856b00b029d4e6c8d1e8ae3d71
---
 res/layout/filtershow_activity.xml   | 18 +-----------------
 res/layout/filtershow_main_panel.xml |  1 +
 2 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 1340bc40d..d89f6b264 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -21,26 +21,11 @@
     android:layout_height="match_parent"
     android:background="#212121" >
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
-
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1" >
 
-            <ProgressBar
-                android:id="@+id/loading"
-                style="@android:style/Widget.Holo.ProgressBar.Large"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@null"
-                android:indeterminate="true"
-                android:indeterminateOnly="true" />
-
             <RelativeLayout
                 android:id="@+id/imageContainer"
                 android:layout_width="match_parent"
@@ -90,7 +75,6 @@
                     android:layout_weight="1" />
             </com.android.gallery3d.filtershow.CenteredLinearLayout>
         </FrameLayout>
-    </LinearLayout>
 
     <com.android.gallery3d.filtershow.category.CategorySelected
         android:id="@+id/categorySelectedIndicator"
@@ -98,4 +82,4 @@
         android:layout_height="@dimen/category_panel_icon_size"
         android:visibility="gone" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index 7a0ead87c..d0e624665 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -108,6 +108,7 @@
                     android:background="@android:color/transparent"
                     android:padding="2dip"
                     android:scaleType="centerInside"
+                    android:visibility="gone"
                     android:src="@drawable/dualcamera"/>
         </LinearLayout>
 
-- 
cgit v1.2.3