Tweaking cling text sizes for other languages. (Bug 11151675)

Change-Id: Iae82064b1be7a33e5375c1e27fb7472216dc637a
This commit is contained in:
Winson Chung
2013-10-31 11:42:39 -07:00
parent c53d77c7b0
commit 13dbfe18a0
5 changed files with 49 additions and 12 deletions

View File

@@ -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

24
res/values-en/dimens.xml Normal file
View File

@@ -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>

View File

@@ -37,6 +37,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>

View File

@@ -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="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:textColor">#49C0EC</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">16sp</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">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>

View File

@@ -4118,6 +4118,9 @@ public class Launcher extends Activity
if (grid.isTablet()) {
return false;
}
if (grid.isLandscape) {
return false;
}
// disable clings when running in a test harness
if(ActivityManager.isRunningInTestHarness()) return false;