From 3ada0966559cd9fee535a40686e049cd0d6f15c0 Mon Sep 17 00:00:00 2001
From: Nebojsa Cvetkovic <nebkat@gmail.com>
Date: Mon, 10 Nov 2014 10:35:00 -0800
Subject: PagedView: Transition Effects

Conflicts:
	res/layout/overview_panel.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/dimens.xml
	res/values/preferences_defaults.xml
	src/com/android/launcher3/AppsCustomizePagedView.java
	src/com/android/launcher3/Launcher.java
	src/com/android/launcher3/PagedView.java
	src/com/android/launcher3/Workspace.java
	src/com/android/launcher3/settings/SettingsProvider.java

Change-Id: Ib134705952877165c334181548d577b3dceece68
---
 res/layout/settings_pane.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml
index cb79e37c6..e12839e10 100644
--- a/res/layout/settings_pane.xml
+++ b/res/layout/settings_pane.xml
@@ -4,6 +4,7 @@
     android:layout_height="match_parent" >
 
     <LinearLayout
+        android:id="@+id/settings_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center_horizontal|bottom"
-- 
cgit v1.2.3