diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/workspace_cling.xml | 6 | ||||
-rw-r--r-- | res/layout-port/workspace_cling.xml | 6 | ||||
-rw-r--r-- | res/layout-sw720dp-port/workspace_cling.xml | 6 | ||||
-rw-r--r-- | res/layout-sw720dp/workspace_cling.xml | 6 | ||||
-rw-r--r-- | res/values-sw600dp/dimens.xml | 2 | ||||
-rw-r--r-- | res/values-sw600dp/styles.xml | 50 | ||||
-rw-r--r-- | res/values-sw720dp/dimens.xml | 1 | ||||
-rw-r--r-- | res/values/dimens.xml | 3 |
8 files changed, 59 insertions, 21 deletions
diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml index dca3937..b66f1bd 100644 --- a/res/layout-land/workspace_cling.xml +++ b/res/layout-land/workspace_cling.xml @@ -28,11 +28,9 @@ android:orientation="vertical"> <TextView style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" android:text="@string/workspace_cling_title" /> <TextView style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/workspace_cling_move_item" /> @@ -40,7 +38,6 @@ </FrameLayout> <TextView style="@style/ClingText" - android:id="@+id/workspace_cling_open_all_apps" android:layout_width="180dp" android:layout_height="wrap_content" android:layout_marginRight="130dp" @@ -49,9 +46,8 @@ android:text="@string/workspace_cling_open_all_apps" /> <Button style="@style/ClingButton" - android:id="@+id/cling_dismiss" android:layout_marginBottom="15dp" android:layout_marginRight="10dp" android:layout_gravity="bottom|right" android:onClick="dismissWorkspaceCling" /> -</com.android.launcher2.Cling>
\ No newline at end of file +</com.android.launcher2.Cling> diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index 6b05c27..10e6976 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/workspace_cling.xml @@ -29,11 +29,9 @@ android:orientation="vertical"> <TextView style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" android:text="@string/workspace_cling_title" /> <TextView style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/workspace_cling_move_item" /> @@ -41,7 +39,6 @@ </FrameLayout> <TextView style="@style/ClingText" - android:id="@+id/workspace_cling_open_all_apps" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="20dp" @@ -52,9 +49,8 @@ android:text="@string/workspace_cling_open_all_apps" /> <Button style="@style/ClingButton" - android:id="@+id/cling_dismiss" android:layout_marginBottom="15dp" android:layout_marginRight="10dp" android:layout_gravity="bottom|right" android:onClick="dismissWorkspaceCling" /> -</com.android.launcher2.Cling>
\ No newline at end of file +</com.android.launcher2.Cling> diff --git a/res/layout-sw720dp-port/workspace_cling.xml b/res/layout-sw720dp-port/workspace_cling.xml index 2eae0fc..29bea81 100644 --- a/res/layout-sw720dp-port/workspace_cling.xml +++ b/res/layout-sw720dp-port/workspace_cling.xml @@ -28,24 +28,20 @@ android:orientation="vertical"> <TextView style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" android:text="@string/workspace_cling_title" /> <TextView style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/workspace_cling_move_item" /> <Button style="@style/ClingButton" - android:id="@+id/cling_dismiss" android:layout_marginTop="15dp" android:onClick="dismissWorkspaceCling" /> </LinearLayout> </FrameLayout> <TextView style="@style/ClingText" - android:id="@+id/workspace_cling_open_all_apps" android:layout_width="180dp" android:layout_height="wrap_content" android:layout_marginTop="15dp" @@ -53,4 +49,4 @@ android:layout_gravity="right" android:gravity="right" android:text="@string/workspace_cling_open_all_apps" /> -</com.android.launcher2.Cling>
\ No newline at end of file +</com.android.launcher2.Cling> diff --git a/res/layout-sw720dp/workspace_cling.xml b/res/layout-sw720dp/workspace_cling.xml index 264b1e0..fd7d4f8 100644 --- a/res/layout-sw720dp/workspace_cling.xml +++ b/res/layout-sw720dp/workspace_cling.xml @@ -28,24 +28,20 @@ android:orientation="vertical"> <TextView style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" android:text="@string/workspace_cling_title" /> <TextView style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/workspace_cling_move_item" /> <Button style="@style/ClingButton" - android:id="@+id/cling_dismiss" android:layout_marginTop="15dp" android:onClick="dismissWorkspaceCling" /> </LinearLayout> </FrameLayout> <TextView style="@style/ClingText" - android:id="@+id/workspace_cling_open_all_apps" android:layout_width="180dp" android:layout_height="wrap_content" android:layout_marginTop="90dp" @@ -53,4 +49,4 @@ android:layout_gravity="right" android:gravity="right" android:text="@string/workspace_cling_open_all_apps" /> -</com.android.launcher2.Cling>
\ No newline at end of file +</com.android.launcher2.Cling> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 1ab495f..3b70d4f 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -16,6 +16,7 @@ <resources> <dimen name="app_icon_size">64dp</dimen> + <dimen name="reveal_radius">64dp</dimen> <dimen name="app_icon_drawable_padding">3dp</dimen> <dimen name="app_icon_padding_top">4dp</dimen> @@ -64,5 +65,4 @@ <dimen name="workspace_width_gap_port">6dp</dimen> <dimen name="workspace_height_gap_land">0dp</dimen> <dimen name="workspace_height_gap_port">24dp</dimen> - </resources> diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml new file mode 100644 index 0000000..200c0a0 --- /dev/null +++ b/res/values-sw600dp/styles.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +* Copyright (C) 2012 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. +*/ +--> + +<resources> + <style name="ClingButton"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:paddingTop">10dp</item> + <item name="android:paddingBottom">15dp</item> + <item name="android:paddingLeft">35dp</item> + <item name="android:paddingRight">35dp</item> + <item name="android:text">@string/cling_dismiss</item> + <item name="android:textStyle">bold</item> + <item name="android:background">@drawable/cling_button_bg</item> + </style> + <style name="ClingTitleText"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_marginBottom">5dp</item> + <item name="android:textSize">30sp</item> + <item name="android:textColor">#33B5E5</item> + <item name="android:shadowColor">#000000</item> + <item name="android:shadowDy">2</item> + <item name="android:shadowRadius">2.0</item> + </style> + <style name="ClingText"> + <item name="android:textSize">22sp</item> + <item name="android:textColor">#FFFFFF</item> + <item name="android:shadowColor">#000000</item> + <item name="android:shadowDy">2</item> + <item name="android:shadowRadius">2.0</item> + <item name="android:lineSpacingMultiplier">1.1</item> + </style> +</resources> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 48c729d..d06f0aa 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -16,6 +16,7 @@ <resources> <dimen name="app_icon_size">72dp</dimen> + <dimen name="reveal_radius">72dp</dimen> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">12dip</dimen> <dimen name="toolbar_button_horizontal_padding">12dip</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d468762..5806d54 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -21,6 +21,9 @@ <!-- The offset for the text in the cling --> <dimen name="cling_text_block_offset_x">0dp</dimen> <dimen name="cling_text_block_offset_y">0dp</dimen> + <dimen name="reveal_radius">48dp</dimen> + <!-- A list of custom punch through x,y coordinates. x and y alternate. default to empty. --> + <array name="punch_through_coords"></array> <!-- Workspace --> <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding |