diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2013-12-02 22:56:42 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2014-01-02 14:12:03 +0000 |
commit | 4f8a7cc2f38a9748f566c9255ce94cb5e6a284fa (patch) | |
tree | 09b876c550266eb30a6690d9abec8e553db4fa3d /android/sdremote | |
parent | 0d0b4a911c2ded7cc2cd64664a1994d0824482db (diff) |
get rid of custom all-caps ui widget
as there is a corresponding property available since Api Level 14 that
is already used in the corresponding stlye definition.
Not a problem if older versions of android ignore that and don't show
the string in caps.
Change-Id: Ia9d5e32242bfc83370524011d11854f2c08348ba
Diffstat (limited to 'android/sdremote')
4 files changed, 6 insertions, 40 deletions
diff --git a/android/sdremote/res/layout/action_bar_computer_creation.xml b/android/sdremote/res/layout/action_bar_computer_creation.xml index 2e31abbeb63a..1a0dcd316765 100644 --- a/android/sdremote/res/layout/action_bar_computer_creation.xml +++ b/android/sdremote/res/layout/action_bar_computer_creation.xml @@ -28,7 +28,7 @@ android:layout_width="0dp" android:layout_height="match_parent"> - <org.libreoffice.impressremote.view.CapsTextView + <TextView style="@style/Widget.Sherlock.ActionBar.TabText" android:text="@string/button_cancel" android:drawableLeft="@drawable/ic_action_cancel" @@ -55,7 +55,7 @@ android:layout_width="0dp" android:layout_height="match_parent"> - <org.libreoffice.impressremote.view.CapsTextView + <TextView style="@style/Widget.Sherlock.ActionBar.TabText" android:text="@string/button_save" android:drawableLeft="@drawable/ic_action_save" diff --git a/android/sdremote/res/layout/activity_requirements.xml b/android/sdremote/res/layout/activity_requirements.xml index adee272fbcef..2cf839d130cf 100644 --- a/android/sdremote/res/layout/activity_requirements.xml +++ b/android/sdremote/res/layout/activity_requirements.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <org.libreoffice.impressremote.view.CapsTextView + <TextView style="@style/SectionHeader" android:text="@string/title_generic"/> @@ -38,7 +38,7 @@ style="@style/SectionItem" android:text="@string/requirements_libreoffice_general_enabled"/> - <org.libreoffice.impressremote.view.CapsTextView + <TextView style="@style/SectionHeader" android:text="@string/title_wifi"/> @@ -54,7 +54,7 @@ style="@style/SectionItem" android:text="@string/requirements_network_ports"/> - <org.libreoffice.impressremote.view.CapsTextView + <TextView style="@style/SectionHeader" android:text="@string/title_bluetooth"/> diff --git a/android/sdremote/res/layout/fragment_slides_pager.xml b/android/sdremote/res/layout/fragment_slides_pager.xml index 97c5c72112db..3a9ebb618e5f 100644 --- a/android/sdremote/res/layout/fragment_slides_pager.xml +++ b/android/sdremote/res/layout/fragment_slides_pager.xml @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="0dp"> - <org.libreoffice.impressremote.view.CapsTextView + <TextView style="@style/SectionHeader" android:text="@string/header_notes" android:paddingTop="@dimen/padding_header"/> diff --git a/android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java b/android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java deleted file mode 100644 index 84b632fe80c6..000000000000 --- a/android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -package org.libreoffice.impressremote.view; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.TextView; - -public class CapsTextView extends TextView { - public CapsTextView(Context aContext) { - super(aContext); - } - - public CapsTextView(Context aContext, AttributeSet aAttributeSet) { - super(aContext, aAttributeSet); - } - - public CapsTextView(Context aContext, AttributeSet aAttributeSet, int aDefinedStyle) { - super(aContext, aAttributeSet, aDefinedStyle); - } - - @Override - public void setText(CharSequence aText, BufferType aBufferType) { - super.setText(aText.toString().toUpperCase(), aBufferType); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |