diff options
author | Winson Chung <winsonc@google.com> | 2013-11-01 12:46:32 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 12:46:32 -0700 |
commit | 7e43e905ab4018389737b3d4f5479dd97b71d963 (patch) | |
tree | 73cef7da215f211591a5d7bd09abdecfcd067356 /res | |
parent | 70e16dbee49fabd78480027e3026026adf43095b (diff) | |
parent | c44a0c0728dcb2ff410a10b426136926789c20a1 (diff) | |
download | android_packages_apps_Trebuchet-7e43e905ab4018389737b3d4f5479dd97b71d963.tar.gz android_packages_apps_Trebuchet-7e43e905ab4018389737b3d4f5479dd97b71d963.tar.bz2 android_packages_apps_Trebuchet-7e43e905ab4018389737b3d4f5479dd97b71d963.zip |
am c44a0c07: Merge "Tweaking cling text sizes for other languages. (Bug 11151675)" into jb-ub-now-jetsonic
* commit 'c44a0c0728dcb2ff410a10b426136926789c20a1':
Tweaking cling text sizes for other languages. (Bug 11151675)
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-port/first_run_cling.xml | 4 | ||||
-rw-r--r-- | res/values-en/dimens.xml | 24 | ||||
-rw-r--r-- | res/values/dimens.xml | 6 | ||||
-rw-r--r-- | res/values/styles.xml | 20 |
4 files changed, 44 insertions, 10 deletions
diff --git a/res/layout-port/first_run_cling.xml b/res/layout-port/first_run_cling.xml index 4830e5df8..ac3939cfd 100644 --- a/res/layout-port/first_run_cling.xml +++ b/res/layout-port/first_run_cling.xml @@ -39,16 +39,14 @@ android:layout_marginBottom="10dp" android:text="@string/first_run_cling_title" android:textColor="#FFFFFFFF" - android:textSize="30sp" android:gravity="center" /> <TextView - style="@style/ClingAltTitleText" + style="@style/ClingAltText" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/first_run_cling_description" android:textColor="#80000000" - android:textSize="16sp" android:gravity="center" /> </LinearLayout> <TextView diff --git a/res/values-en/dimens.xml b/res/values-en/dimens.xml new file mode 100644 index 000000000..01d4693c7 --- /dev/null +++ b/res/values-en/dimens.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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> +<!-- Cling --> + <dimen name="cling_title_text_size">22sp</dimen> + <dimen name="cling_text_size">16sp</dimen> + <dimen name="cling_alt_title_text_size">30sp</dimen> + <dimen name="cling_alt_text_size">16sp</dimen> + <dimen name="cling_hint_text_size">18sp</dimen> +</resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d87fb1431..4242cc768 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -38,6 +38,12 @@ <add-resource type="dimen" name="custom_cling_margin_top" /> <add-resource type="dimen" name="custom_cling_margin_right" /> <add-resource type="dimen" name="custom_cling_margin_left" /> + + <dimen name="cling_title_text_size">20sp</dimen> + <dimen name="cling_text_size">14sp</dimen> + <dimen name="cling_alt_title_text_size">24sp</dimen> + <dimen name="cling_alt_text_size">16sp</dimen> + <dimen name="cling_hint_text_size">14sp</dimen> <!-- Workspace --> <dimen name="workspace_max_gap">16dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 39e55d894..8226915dd 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -52,27 +52,33 @@ <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">22sp</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">24sp</item> + <item name="android:textSize">@dimen/cling_alt_title_text_size</item> <item name="android:textColor">#49C0EC</item> </style> - <style name="ClingText"> + <style name="ClingAltText"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">16sp</item> - <item name="android:textColor">#80000000</item> - <item name="android:lineSpacingMultiplier">1.1</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">18sp</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> |