karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Fix text size in choose activity for API level less than 14.

Browse Source
This commit is contained in:
Jimmy Shih
2012-06-20 16:34:33 -07:00
parent d7cd8dfcf5
commit 191fdf88ea
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/choose_activity_list_item.xml
+4 -2
View File
@@ -39,13 +39,15 @@ limitations under the License.
android:layout_width="wrap_content"
android:maxLines="2"
android:paddingLeft="16dp"
android:textAppearance="?android:attr/textAppearanceListItemSmall" />
android:textAppearance="?android:attr/textAppearanceListItemSmall"
style="@style/TextChooseActivity" />
<TextView
android:id="@+id/choose_activity_list_item_text2"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:maxLines="2"
android:paddingLeft="16dp"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceListItemSmall"
style="@style/TextChooseActivity" />
</LinearLayout>
</LinearLayout>
MyTracks/res/values-v14/styles.xml
+4 -1
View File
@@ -15,6 +15,9 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- The style for choose activity text -->
<style name="TextChooseActivity">
</style>
<!-- The style for large size text -->
<style name="TextLarge" parent="@android:style/TextAppearance.DeviceDefault.Large">
<item name="android:layout_height">wrap_content</item>
@@ -25,7 +28,7 @@ limitations under the License.
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
</style>
<!-- The style for large size text -->
<!-- The style for small size text -->
<style name="TextSmall" parent="@android:style/TextAppearance.DeviceDefault.Small">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
MyTracks/res/values/styles.xml
+7 -1
View File
@@ -143,10 +143,15 @@ limitations under the License.
<item name="android:paddingRight">8dp</item>
<item name="android:textColor">@android:color/primary_text_light</item>
</style>
<!-- The style for choose activity text -->
<style name="TextChooseActivity">
<item name="android:textSize">18sp</item>
</style>
<!-- The style for large size text -->
<style name="TextLarge">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textSize">22sp</item>
</style>
<!-- The style for large size text with top margin -->
@@ -157,6 +162,7 @@ limitations under the License.
<style name="TextMedium">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textSize">18sp</item>
</style>
<!-- The style for medium size text with an icon on the left -->
@@ -164,7 +170,7 @@ limitations under the License.
<item name="android:drawablePadding">8dp</item>
<item name="android:gravity">center_vertical</item>
</style>
<!-- The style for large size text -->
<!-- The style for small size text -->
<style name="TextSmall">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>