summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-08-22 16:09:37 -0700
committerSunny Goyal <sunnygoyal@google.com>2014-08-25 11:38:02 -0700
commit424418bb50ccf5d9270650b70cc51f423da51a65 (patch)
tree23c7b40d02e7b4dfda6395b7b30ea6305a27dd1a /res/values
parentdec12adb6dba114ad2feedce3a9f3ce0c178fc04 (diff)
downloadandroid_packages_apps_Trebuchet-424418bb50ccf5d9270650b70cc51f423da51a65.tar.gz
android_packages_apps_Trebuchet-424418bb50ccf5d9270650b70cc51f423da51a65.tar.bz2
android_packages_apps_Trebuchet-424418bb50ccf5d9270650b70cc51f423da51a65.zip
Updating clings, removing ununsed clings
issue: 16127412 Change-Id: I1d18515765100ff10d33439b3ac39ebfc5da35c7
Diffstat (limited to 'res/values')
-rw-r--r--res/values/attrs.xml10
-rw-r--r--res/values/colors.xml1
-rw-r--r--res/values/dimens.xml5
-rw-r--r--res/values/styles.xml47
4 files changed, 9 insertions, 54 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 0db60c95c..a2bdafcd8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -25,17 +25,15 @@
<attr name="sourceViewId" format="integer" />
</declare-styleable>
- <!-- Cling specific attributes. These attributes are used to customize
+ <!-- ClearCircleLayout specific attributes. These attributes are used to customize
the cling in XML files. -->
- <declare-styleable name="Cling">
+ <declare-styleable name="ClearCircleLayout">
<!-- Used to identify how to draw the cling bg -->
- <attr name="drawIdentifier" format="string" />
+ <attr name="holeLocation" format="string" />
</declare-styleable>
- <!-- Page Indicator specific attributes. These attributes are used to customize
- the cling in XML files. -->
+ <!-- Page Indicator specific attributes. -->
<declare-styleable name="PageIndicator">
- <!-- Used to identify how to draw the cling bg -->
<attr name="windowSize" format="integer" />
</declare-styleable>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8aa2184e5..7ddb1e47f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -37,5 +37,4 @@
<color name="outline_color">#FFFFFFFF</color>
<color name="widget_text_panel">#FF374248</color>
- <color name="first_run_cling_circle_background_color">#64b1ea</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b2e183c63..4fd8faba2 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -29,6 +29,11 @@
<dimen name="dynamic_grid_overview_bar_spacer_width">68dp</dimen>
<!-- Cling -->
+ <dimen name="cling_migration_logo_height">240dp</dimen>
+ <dimen name="cling_migration_logo_width">165dp</dimen>
+ <dimen name="cling_migration_bg_size">400dp</dimen>
+ <dimen name="cling_migration_bg_shift">-200dp</dimen>
+
<dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
<dimen name="folderClingMarginTop">20dp</dimen>
<!-- The offset for the text in the cling -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 056930604..77ebc12d9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,53 +18,6 @@
-->
<resources>
- <style name="ClingButton">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:paddingTop">15dp</item>
- <item name="android:paddingBottom">15dp</item>
- <item name="android:paddingLeft">50dp</item>
- <item name="android:paddingRight">50dp</item>
- <item name="android:text">@string/cling_dismiss</item>
- <item name="android:textColor">#ffffff</item>
- <item name="android:textStyle">bold</item>
- <item name="android:textSize">16sp</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">@dimen/cling_title_text_size</item>
- <item name="android:textColor">#ffffff</item>
- <item name="android:fontFamily">sans-serif-condensed</item>
- </style>
- <style name="ClingText">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">@dimen/cling_text_size</item>
- <item name="android:textColor">#80000000</item>
- <item name="android:lineSpacingMultiplier">1.1</item>
- </style>
- <style name="ClingAltTitleText">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">@dimen/cling_alt_title_text_size</item>
- <item name="android:textColor">#49C0EC</item>
- </style>
- <style name="ClingAltText">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">@dimen/cling_alt_text_size</item>
- <item name="android:textColor">#49C0EC</item>
- </style>
- <style name="ClingHintText">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">@dimen/cling_hint_text_size</item>
- <item name="android:textColor">#80ffffff</item>
- <item name="android:fontFamily">sans-serif-condensed</item>
- </style>
<style name="WorkspaceIcon">
<item name="android:layout_width">match_parent</item>