From 44d180199b36f1ff17edbc7c0c68c0a0298f78f4 Mon Sep 17 00:00:00 2001
From: Matt Garnes <matt@cyngn.com>
Date: Thu, 23 Jan 2014 08:56:37 -0800
Subject: GEL Integration (2/2)

Launch search from extra panel to mimic Google Launcher.

Changed Trebuchet to build against CM instead of the AOSP SDK.
Added support to swipe left from the home screen to enter Google Now, if it is installed.
A right swipe will return the user to the home screen.

Change-Id: Ia1a77fedea7e67bcd54a6b6d66099f8366d6b1dc
---
 .../android/launcher3/OverviewSettingsPanel.java   | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'src/com/android/launcher3/OverviewSettingsPanel.java')

diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index fd8095f87..e3fbfa3ed 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -24,6 +24,7 @@ public class OverviewSettingsPanel {
     private View mOverviewPanel;
     private SettingsPinnedHeaderAdapter mSettingsAdapter;
     private PinnedHeaderListView mListView;
+    private String[] mValues;
 
     OverviewSettingsPanel(Launcher launcher, View overviewPanel) {
         mLauncher = launcher;
@@ -40,11 +41,25 @@ public class OverviewSettingsPanel {
         String[] headers = new String[] {
                 res.getString(R.string.home_screen_settings),
                 res.getString(R.string.drawer_settings)};
-        String[] values = new String[] {
-                res.getString(R.string.home_screen_search_text),
-                res.getString(R.string.scroll_effect_text),
-                res.getString(R.string.larger_icons_text),
-                res.getString(R.string.hide_icon_labels)};
+
+        String[] values;
+        if(mLauncher.isGelIntegrationSupported()) {
+            values = new String[]{
+                    res.getString(R.string.home_screen_search_text),
+                    res.getString(R.string.search_screen_left_text),
+                    res.getString(R.string.scroll_effect_text),
+                    res.getString(R.string.larger_icons_text),
+                    res.getString(R.string.hide_icon_labels)};
+        } else {
+            values = new String[]{
+                    res.getString(R.string.home_screen_search_text),
+                    res.getString(R.string.scroll_effect_text),
+                    res.getString(R.string.larger_icons_text),
+                    res.getString(R.string.hide_icon_labels)};
+        }
+
+        mValues = values;
+
         String[] valuesDrawer = new String[] {
                 res.getString(R.string.scroll_effect_text),
                 res.getString(R.string.drawer_sorting_text),
@@ -162,13 +177,8 @@ public class OverviewSettingsPanel {
             mSettingsAdapter.changeCursor(0, createCursor(res
                     .getString(R.string.home_screen_settings), new String[]{}));
         } else {
-            String[] values = new String[] {
-                    res.getString(R.string.home_screen_search_text),
-                    res.getString(R.string.scroll_effect_text),
-                    res.getString(R.string.larger_icons_text),
-                    res.getString(R.string.hide_icon_labels)};
             mSettingsAdapter.changeCursor(0, createCursor(res
-                    .getString(R.string.home_screen_settings), values));
+                    .getString(R.string.home_screen_settings), mValues));
         }
 
         // Make sure overview panel is drawn above apps customize and collapsed
-- 
cgit v1.2.3