From a85c80227a56f3b7f917464096cd33877093616f Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Wed, 17 Aug 2011 22:07:43 +0800
Subject: Initial code for Gallery2.

fix: 5176434

Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
---
 res/layout/cropimage.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 res/layout/cropimage.xml

(limited to 'res/layout/cropimage.xml')

diff --git a/res/layout/cropimage.xml b/res/layout/cropimage.xml
new file mode 100644
index 000000000..aefebe82d
--- /dev/null
+++ b/res/layout/cropimage.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <view class="com.android.gallery3d.ui.GLRootView"
+            android:id="@+id/gl_root_view"
+            android:background="@null"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+</FrameLayout>
-- 
cgit v1.2.3


From 1d306766046b5336d59d82c3c82f8ae6bd12cec0 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Tue, 22 May 2012 21:26:36 -0700
Subject: Put a black View in front of SurfaceView.

This prevents SurfaceView from being transparent before the first draw.

Bug: 6507478
Change-Id: I2170f23d4c9844bfc3854d6120f5e72cc0d591ca
---
 res/layout/cropimage.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'res/layout/cropimage.xml')

diff --git a/res/layout/cropimage.xml b/res/layout/cropimage.xml
index aefebe82d..c434fb6a6 100644
--- a/res/layout/cropimage.xml
+++ b/res/layout/cropimage.xml
@@ -17,9 +17,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <view class="com.android.gallery3d.ui.GLRootView"
-            android:id="@+id/gl_root_view"
-            android:background="@null"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+    <include layout="@layout/gl_root_group"/>
 </FrameLayout>
-- 
cgit v1.2.3