summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout/overview_panel.xml9
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/com/android/launcher3/Launcher.java9
3 files changed, 20 insertions, 0 deletions
diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml
index 713adea3c..e05adf2b9 100644
--- a/res/layout/overview_panel.xml
+++ b/res/layout/overview_panel.xml
@@ -36,4 +36,13 @@
android:layout_height="wrap_content"
android:text="@string/wallpaper_button_text"
android:textSize="18dp" />
+ <Space
+ android:layout_width="@dimen/overview_panel_buttonSpacing"
+ android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/settings_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/settings_button_text"
+ android:textSize="18dp" />
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7b97889ac..b860d42aa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -289,4 +289,6 @@ s -->
<string name="widget_button_text">Add Widget</string>
<!-- Text for wallpaper change button -->
<string name="wallpaper_button_text">Wallpaper</string>
+ <!-- Text for settings button -->
+ <string name="settings_button_text">Settings</string>
</resources>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 35e166fc2..7970b71be 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -921,6 +921,9 @@ public class Launcher extends Activity
public void onHide();
}
+ protected void startSettings() {
+ }
+
public interface QSBScroller {
public void setScrollY(int scrollY);
}
@@ -1123,6 +1126,12 @@ public class Launcher extends Activity
startWallpaper();
}
});
+ findViewById(R.id.settings_button).setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View arg0) {
+ startSettings();
+ }
+ });
// Setup the workspace
mWorkspace.setHapticFeedbackEnabled(false);