diff options
author | Nebojsa Cvetkovic <nebkat@gmail.com> | 2013-11-25 16:58:53 +0000 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-01-24 16:24:23 -0800 |
commit | 4fd7c82ec6cab6d160f72b0355f6c5fc399b1a43 (patch) | |
tree | 637afa03fb37b22d280ec6b22df5a47d278237cb /res | |
parent | 2af21d644dfdb5db0a0da751937566058c0cdfc4 (diff) | |
download | android_packages_apps_Trebuchet-4fd7c82ec6cab6d160f72b0355f6c5fc399b1a43.tar.gz android_packages_apps_Trebuchet-4fd7c82ec6cab6d160f72b0355f6c5fc399b1a43.tar.bz2 android_packages_apps_Trebuchet-4fd7c82ec6cab6d160f72b0355f6c5fc399b1a43.zip |
Workspace: Custom default screen
Change-Id: Ic90254f7758b9dbd4997a19474e455230355b772
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_default_screen.png | bin | 0 -> 18144 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_default_screen_pressed.png | bin | 0 -> 18857 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_default_screen.png | bin | 0 -> 17779 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_default_screen_pressed.png | bin | 0 -> 18202 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_default_screen.png | bin | 0 -> 18388 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_default_screen_pressed.png | bin | 0 -> 19556 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_default_screen.png | bin | 0 -> 19024 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_default_screen_pressed.png | bin | 0 -> 21488 bytes | |||
-rw-r--r-- | res/drawable/default_screen_button.xml | 22 | ||||
-rw-r--r-- | res/layout/overview_panel.xml | 93 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 3 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 |
12 files changed, 82 insertions, 37 deletions
diff --git a/res/drawable-hdpi/ic_default_screen.png b/res/drawable-hdpi/ic_default_screen.png Binary files differnew file mode 100644 index 000000000..832fdef35 --- /dev/null +++ b/res/drawable-hdpi/ic_default_screen.png diff --git a/res/drawable-hdpi/ic_default_screen_pressed.png b/res/drawable-hdpi/ic_default_screen_pressed.png Binary files differnew file mode 100644 index 000000000..2975c6152 --- /dev/null +++ b/res/drawable-hdpi/ic_default_screen_pressed.png diff --git a/res/drawable-mdpi/ic_default_screen.png b/res/drawable-mdpi/ic_default_screen.png Binary files differnew file mode 100644 index 000000000..431b16841 --- /dev/null +++ b/res/drawable-mdpi/ic_default_screen.png diff --git a/res/drawable-mdpi/ic_default_screen_pressed.png b/res/drawable-mdpi/ic_default_screen_pressed.png Binary files differnew file mode 100644 index 000000000..361f023f8 --- /dev/null +++ b/res/drawable-mdpi/ic_default_screen_pressed.png diff --git a/res/drawable-xhdpi/ic_default_screen.png b/res/drawable-xhdpi/ic_default_screen.png Binary files differnew file mode 100644 index 000000000..da1e3a883 --- /dev/null +++ b/res/drawable-xhdpi/ic_default_screen.png diff --git a/res/drawable-xhdpi/ic_default_screen_pressed.png b/res/drawable-xhdpi/ic_default_screen_pressed.png Binary files differnew file mode 100644 index 000000000..b8dc28c0c --- /dev/null +++ b/res/drawable-xhdpi/ic_default_screen_pressed.png diff --git a/res/drawable-xxhdpi/ic_default_screen.png b/res/drawable-xxhdpi/ic_default_screen.png Binary files differnew file mode 100644 index 000000000..4577ad2b5 --- /dev/null +++ b/res/drawable-xxhdpi/ic_default_screen.png diff --git a/res/drawable-xxhdpi/ic_default_screen_pressed.png b/res/drawable-xxhdpi/ic_default_screen_pressed.png Binary files differnew file mode 100644 index 000000000..cf9cd10e2 --- /dev/null +++ b/res/drawable-xxhdpi/ic_default_screen_pressed.png diff --git a/res/drawable/default_screen_button.xml b/res/drawable/default_screen_button.xml new file mode 100644 index 000000000..5194ad8de --- /dev/null +++ b/res/drawable/default_screen_button.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_focused="true" android:drawable="@drawable/ic_default_screen_pressed" /> + <item android:state_pressed="true" android:drawable="@drawable/ic_default_screen_pressed" /> + <item android:state_activated="true" android:drawable="@drawable/ic_default_screen_pressed" /> + <item android:drawable="@drawable/ic_default_screen" /> +</selector> diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index e36004c4b..46e6e07e2 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -13,51 +13,70 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_gravity="center_horizontal|bottom" - android:paddingBottom="@dimen/overview_panel_bottom_padding"> - + android:layout_width="match_parent" + android:layout_height="match_parent"> <TextView - android:id="@+id/wallpaper_button" + android:id="@+id/default_screen_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/wallpaper_button_text" + android:layout_gravity="center_horizontal|top" + android:paddingTop="@dimen/overview_panel_top_padding" + android:text="@string/default_screen_button_text" android:drawablePadding="4dp" - android:drawableTop="@drawable/wallpaper_button" + android:drawableTop="@drawable/default_screen_button" android:gravity="center_horizontal" android:fontFamily="sans-serif-condensed" android:textAllCaps="true" android:textSize="12sp" /> - <Space - android:layout_width="@dimen/overview_panel_buttonSpacing" - android:layout_height="wrap_content"/> - <TextView - android:id="@+id/widget_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/widget_button_text" - android:drawablePadding="4dp" - android:gravity="center_horizontal" - android:drawableTop="@drawable/widget_button" - android:fontFamily="sans-serif-condensed" - android:textAllCaps="true" - android:textSize="12sp"/> - <Space - android:layout_width="@dimen/overview_panel_buttonSpacing" - android:layout_height="wrap_content"/> - <TextView - android:id="@+id/settings_button" + + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/settings_button_text" - android:drawablePadding="4dp" - android:gravity="center_horizontal" - android:drawableTop="@drawable/setting_button" - android:fontFamily="sans-serif-condensed" - android:textAllCaps="true" - android:textSize="12sp" /> -</LinearLayout> + android:orientation="horizontal" + android:layout_gravity="center_horizontal|bottom" + android:paddingBottom="@dimen/overview_panel_bottom_padding"> + + <TextView + android:id="@+id/wallpaper_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/wallpaper_button_text" + android:drawablePadding="4dp" + android:drawableTop="@drawable/wallpaper_button" + android:gravity="center_horizontal" + android:fontFamily="sans-serif-condensed" + android:textAllCaps="true" + android:textSize="12sp" /> + <Space + android:layout_width="@dimen/overview_panel_buttonSpacing" + android:layout_height="wrap_content"/> + <TextView + android:id="@+id/widget_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/widget_button_text" + android:drawablePadding="4dp" + android:gravity="center_horizontal" + android:drawableTop="@drawable/widget_button" + android:fontFamily="sans-serif-condensed" + android:textAllCaps="true" + android:textSize="12sp"/> + <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:drawablePadding="4dp" + android:gravity="center_horizontal" + android:drawableTop="@drawable/setting_button" + android:fontFamily="sans-serif-condensed" + android:textAllCaps="true" + android:textSize="12sp" /> + </LinearLayout> +</FrameLayout> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 320567826..131acc9e8 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -5,6 +5,9 @@ <!-- App version --> <string name="application_version" translatable="false">0.1</string> + <!-- Text for default screen button --> + <string name="default_screen_button_text">Default Screen</string> + <!-- Settings --> <string name="preferences_title">Settings</string> <!-- UI --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b4b2367c7..8176c8192 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -41,6 +41,7 @@ <dimen name="workspace_max_gap">16dp</dimen> <dimen name="workspace_overscroll_drawable_padding">0dp</dimen> <dimen name="workspace_spring_loaded_page_spacing">15dp</dimen> + <dimen name="overview_panel_top_padding">20dp</dimen> <dimen name="overview_panel_bottom_padding">50dp</dimen> <dimen name="overview_panel_buttonSpacing">60dp</dimen> <dimen name="overview_mode_page_offset">130dp</dimen> |