android/sdremote/res/layout/action_bar_computer_creation.xml |
4 -
android/sdremote/res/layout/activity_requirements.xml |
6 -
android/sdremote/res/layout/fragment_slides_pager.xml |
2
android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java |
34 ----------
4 files changed, 6 insertions(+), 40 deletions(-)
New commits:
commit 4f8a7cc2f38a9748f566c9255ce94cb5e6a284fa
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Mon Dec 2 22:56:42 2013 +0100
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
diff --git a/android/sdremote/res/layout/action_bar_computer_creation.xml
b/android/sdremote/res/layout/action_bar_computer_creation.xml
index 2e31abb..1a0dcd3 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 adee272..2cf839d 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 97c5c72..3a9ebb6 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 84b632f..0000000
--- 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: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
