commit fb55994c78d7b6af919d45ab015f5dc0a8665ac8
author Chih-Chung Chang <chihchung@google.com> Mon Mar 12 12:46:25 2012 +0800
committer Chih-Chung Chang <chihchung@google.com> Mon Mar 12 12:46:25 2012 +0800
tree 6ac915e20c98978f8fba0989f80a4c040c235dd7
parent 392352c673069715e74deecafdc7b65565f04a31

Change id "root" to "movie_view_root" to avoid confusion.

There is also one id "root" in Camera.

Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7

res/layout/movie_view.xml

diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml
index bd0415c..4e645cf 100644
--- a/res/layout/movie_view.xml
+++ b/res/layout/movie_view.xml
@@ -15,7 +15,7 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
+    android:id="@+id/movie_view_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

src/com/android/gallery3d/app/MovieActivity.java

diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 9ad63db..4df84f4 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -57,7 +57,7 @@
         requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
 
         setContentView(R.layout.movie_view);
-        View rootView = findViewById(R.id.root);
+        View rootView = findViewById(R.id.movie_view_root);
         Intent intent = getIntent();
         initializeActionBar(intent);
         mFinishOnCompletion = intent.getBooleanExtra(