Merge "Added settings button to overview mode" into jb-ub-gel-agar

This commit is contained in:
Adam Cohen
2013-08-29 21:45:13 +00:00
committed by Android (Google) Code Review
3 changed files with 20 additions and 0 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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);