diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-08-29 21:45:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-29 21:45:13 +0000 |
| commit | d1bfb51ef33e337d4ec9efa58d7b222224ce5c1c (patch) | |
| tree | 137e6aaf1aebf48937827c046a05ab923939e105 /res | |
| parent | fe09cb7fe3ec1ab3e7aabd2d0415de61df31c4db (diff) | |
| parent | 30bacb215893882688bf50479bcd4843f83a661b (diff) | |
| download | android_packages_apps_Trebuchet-d1bfb51ef33e337d4ec9efa58d7b222224ce5c1c.tar.gz android_packages_apps_Trebuchet-d1bfb51ef33e337d4ec9efa58d7b222224ce5c1c.tar.bz2 android_packages_apps_Trebuchet-d1bfb51ef33e337d4ec9efa58d7b222224ce5c1c.zip | |
Merge "Added settings button to overview mode" into jb-ub-gel-agar
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/overview_panel.xml | 9 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 11 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> |