[Libreoffice-commits] core.git: 3 commits - android/sdremote
Tor Lillqvist
tml at iki.fi
Tue Feb 12 13:26:03 PST 2013
android/sdremote/res/values/styles.xml | 54 ----------
android/sdremote/src/org/libreoffice/impressremote/AboutDialogBuilder.java | 5
android/sdremote/src/org/libreoffice/impressremote/ActivityChangeBroadcastProcessor.java | 5
android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java | 5
android/sdremote/src/org/libreoffice/impressremote/Globals.java | 17 +++
android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java | 5
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java | 3
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java | 3
android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java | 8 -
android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java | 5
android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java | 5
android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java | 3
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java | 10 +
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java | 13 +-
android/sdremote/src/org/libreoffice/impressremote/communication/Client.java | 3
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java | 5
android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java | 10 +
android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java | 3
android/sdremote/src/org/libreoffice/impressremote/communication/ReconnectionActivity.java | 5
android/sdremote/src/org/libreoffice/impressremote/communication/Server.java | 5
android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java | 11 +-
android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java | 3
android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java | 5
23 files changed, 93 insertions(+), 98 deletions(-)
New commits:
commit 0d18ec16be3a0850a224492f049e6096ffedc96f
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Feb 12 23:21:38 2013 +0200
Emacs and vim mode line tweaks
These files are Java, not C++. Add empty line before the vim mode line.
Change-Id: Ia94d18e9995ecfbbbfd1c9e6a4d2ce4e8ffb95f3
diff --git a/android/sdremote/src/org/libreoffice/impressremote/AboutDialogBuilder.java b/android/sdremote/src/org/libreoffice/impressremote/AboutDialogBuilder.java
index 3f1cd3a..3fdc5a8 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/AboutDialogBuilder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/AboutDialogBuilder.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -57,4 +57,5 @@ public class AboutDialogBuilder extends AlertDialog.Builder {
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ActivityChangeBroadcastProcessor.java b/android/sdremote/src/org/libreoffice/impressremote/ActivityChangeBroadcastProcessor.java
index 2c70e17..92003bf 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ActivityChangeBroadcastProcessor.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/ActivityChangeBroadcastProcessor.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -62,4 +62,5 @@ public class ActivityChangeBroadcastProcessor {
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java b/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
index 1bb2aa4..be82eeb 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -85,4 +85,5 @@ public class BlankScreenFragment extends SherlockFragment {
mCommunicationService.getTransmitter().resume();
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java b/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
index 2ce2990..f9e6c92 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -64,4 +64,5 @@ public class PairingActivity extends SherlockActivity {
};
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 8ca76e7..0de6b32 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -545,4 +545,5 @@ public class PresentationActivity extends SherlockFragmentActivity {
}
};
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 9ad3b79..bb24d40a7 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -327,4 +327,5 @@ public class PresentationFragment extends SherlockFragment {
}
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index e8f4703..ac6012b 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -392,4 +392,5 @@ public class SelectorActivity extends SherlockActivity {
return super.onContextItemSelected(item);
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java b/android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java
index 95ed905..56d5bad 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -36,4 +36,5 @@ public class SettingsActivity extends SherlockPreferenceActivity {
}
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
index 0d89c84..44a3368 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -98,4 +98,5 @@ public class StartPresentationActivity extends SherlockActivity {
}
};
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java b/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
index dace201..d1f2487 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -236,4 +236,5 @@ public class ThumbnailFragment extends SherlockFragment {
}
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
index fe6ce6f..49be8a3 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -91,4 +91,5 @@ public class BluetoothClient extends Client {
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
index dc0db45..87535da 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -105,4 +105,5 @@ public class BluetoothFinder {
};
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java
index 4f90eb2..1c3dce8 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -137,4 +137,5 @@ public abstract class Client {
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index cc56398..b3af391 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -324,4 +324,5 @@ public class CommunicationService extends Service implements Runnable {
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
index 595d643..778f9c3 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -134,4 +134,5 @@ public class NetworkClient extends Client {
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
index 0322b1f..5a6316e 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -118,4 +118,5 @@ public class Receiver {
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/ReconnectionActivity.java b/android/sdremote/src/org/libreoffice/impressremote/communication/ReconnectionActivity.java
index d519188..8417cde 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/ReconnectionActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/ReconnectionActivity.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -23,4 +23,5 @@ public class ReconnectionActivity extends SherlockActivity {
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
index 42d028b..a09cc6a 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -54,4 +54,5 @@ public class Server {
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
index bd15c43..703069c 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -187,4 +187,5 @@ public class ServerFinder {
return mServerList.values();
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
index 0b29237..2135dbf 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -183,4 +183,5 @@ public class SlideShow {
}
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java
index 1c8ce9b..eebc2f3 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -66,4 +66,5 @@ public class Transmitter {
mClient.sendCommand("presentation_stop\n\n");
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ab0bbe53ae02361d521c133dd5c0b6db3423b0cb
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Feb 12 23:02:42 2013 +0200
Just use default colours until proven they don't work;)
After 5adefb21244ca57b95e9f8df6ec18880438201bf the "computer" names on the
main ("Choose a Computer") dialog (which probably isn't the right term) were
invisible for me on my Android 4.1 device at least. Very light grey on white,
or something like that. Let's try with default colours and then if that
doesn't work *slowly* modify the colours one item by one.
Change-Id: I9ae2ee8232cfa85eee4aba0fbcf69b8c245a1ad6
diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml
index c88c947..683114f 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -14,67 +14,15 @@
<color name="thumbnail_border">#B4B4B4</color>
<color name="thumbnail_border_selected">#EE4400</color>
- <style name="Theme.ImpressRemote.ActionBar.Title" parent="android:style/Widget.Holo.Light.ActionBar">
- <item name="android:textColor">@color/white</item>
- <item name="android:textSize">18dp</item>
- </style>
-
- <style name="Theme.ImpressRemote.ActionBar" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
- <item name="android:background">@color/orange</item>
- <item name="background">@color/orange</item>
- <item name="android:titleTextStyle">@style/Theme.ImpressRemote.ActionBar.Title</item>
- <item name="titleTextStyle">@style/Theme.ImpressRemote.ActionBar.Title</item>
- <item name="backgroundSplit">@color/text_grey</item>
- <item name="android:backgroundSplit">@color/text_grey</item>
- </style>
-
- <style name="Theme.ImpressRemote.ActionBarWidget" parent="android:style/Widget.Holo.Light">
- <item name="android:background">@color/orange</item>
- <item name="android:textColor">@color/white</item>
- <item name="android:textSize">22dp</item>
- </style>
-
- <style name="Theme.ImpressRemote.ActionBarMenu" parent="android:style/Widget.Holo.Light.ListPopupWindow">
- <item name="android:background">@color/grey</item>
- <!-- <item name="android:popupBackground">@color/black</item> -->
- </style>
-
<style name="Theme.ImpressRemote.ActionBarMenuItem" parent="Widget.Sherlock.Light.Spinner.DropDown.ActionBar">
- <item name="android:background">@color/grey</item>
- <item name="android:textColor">@color/white</item>
<item name="android:textSize">16dp</item>
</style>
- <style name="Theme.ImpressRemote.Dialog" parent="@android:style/Theme.Dialog">
- <item name="android:windowBackground">@color/light_grey</item>
- <item name="android:fullDark">@color/light_grey</item>
- <item name="android:topDark">@color/light_grey</item>
- <item name="android:centerDark">@color/light_grey</item>
- <item name="android:bottomDark">@color/light_grey</item>
- <item name="android:fullBright">@color/light_grey</item>
- <item name="android:centerBright">@color/light_grey</item>
- <item name="android:bottomBright">@color/light_grey</item>
- <item name="android:bottomMedium">@color/light_grey</item>
- <item name="android:centerMedium">@color/light_grey</item>
- <item name="android:textColor">@color/grey</item>
- </style>
-
- <style name="Theme.ImpressRemote.Dialog.Title" parent="@android:style/Theme.Dialog">
- <item name="android:textColor">@color/grey</item>
- </style>
-
<style name="Theme.ImpressRemote" parent="Theme.Sherlock.Light.DarkActionBar">
- <item name="android:actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item>
- <item name="actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item>
- <item name="android:popupMenuStyle">@style/Theme.ImpressRemote.ActionBarMenu</item>
<item name="android:dropDownListViewStyle">@style/Theme.ImpressRemote.ActionBarMenuItem</item>
- <item name="android:textAppearanceLargePopupMenu">@style/Theme.ImpressRemote.ActionBarMenuItem</item> <!-- <item name="android:actionBarWidgetTheme">@style/Theme.ImpressRemote.ActionBarWidget</item> -->
- <item name="android:actionDropDownStyle">@style/Theme.ImpressRemote.ActionBarMenu</item>
- <item name="android:windowBackground">@color/light_grey</item>
+ <item name="android:textAppearanceLargePopupMenu">@style/Theme.ImpressRemote.ActionBarMenuItem</item>
<item name="android:homeAsUpIndicator">@drawable/up_indicator_white</item>
- <item name="android:textColor">@color/light_grey</item>
<item name="android:alertDialogStyle">@style/Theme.ImpressRemote.Dialog</item>
-
</style>
</resources>
commit 47f6db6469f5fa8bc036d2b8b5f2097a17cd1a8e
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Feb 12 23:00:51 2013 +0200
Use android.util.Log instead of printing to System.out
Change-Id: I314066086827d283938c6f402733da3f801ad55b
diff --git a/android/sdremote/src/org/libreoffice/impressremote/Globals.java b/android/sdremote/src/org/libreoffice/impressremote/Globals.java
new file mode 100644
index 0000000..a767bb1
--- /dev/null
+++ b/android/sdremote/src/org/libreoffice/impressremote/Globals.java
@@ -0,0 +1,17 @@
+/* -*- 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;
+
+public class Globals {
+
+ public static final String TAG = "sdremote";
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index e9d0686..e8f4703 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
@@ -30,6 +30,7 @@ import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -252,10 +253,8 @@ public class SelectorActivity extends SherlockActivity {
private HashMap<Server, View> mNetworkServers = new HashMap<Server, View>();
private void deleteServer(View aView) {
+ Log.i(Globals.TAG, "SelectorActivity.deleteServer(" + aView + ")");
for (Entry<Server, View> aEntry : mNetworkServers.entrySet()) {
- System.out.println(aEntry.getKey().getName());
- System.out.println(aView);
- System.out.println(aEntry.getValue());
if (aEntry.getValue() == aView
.findViewById(R.id.selector_sub_label)
|| aEntry.getValue().findViewById(
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
index b395169..fe6ce6f 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
@@ -13,11 +13,14 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.UUID;
+import org.libreoffice.impressremote.Globals;
+
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothSocket;
import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
/**
* Standard Network client. Connects to a server using Sockets.
@@ -49,7 +52,7 @@ public class BluetoothClient extends Client {
mSocket = aDevice.createRfcommSocketToServiceRecord(UUID
.fromString("00001101-0000-1000-8000-00805F9B34FB"));
mSocket.connect();
- System.out.println("Connected");
+ Log.i(Globals.TAG, "BluetoothClient: connected");
mInputStream = mSocket.getInputStream();
mReader = new BufferedReader(new InputStreamReader(mInputStream,
@@ -57,7 +60,7 @@ public class BluetoothClient extends Client {
mOutputStream = mSocket.getOutputStream();
String aTemp = mReader.readLine();
- System.out.println("SF:waited");
+ Log.i(Globals.TAG, "BluetoothClient: got line " + aTemp);
if (!aTemp.equals("LO_SERVER_SERVER_PAIRED")) {
return;
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
index c3a54af..dc0db45 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
@@ -11,6 +11,7 @@ package org.libreoffice.impressremote.communication;
import java.util.Collection;
import java.util.HashMap;
+import org.libreoffice.impressremote.Globals;
import org.libreoffice.impressremote.communication.Server.Protocol;
import android.bluetooth.BluetoothAdapter;
@@ -21,6 +22,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.os.Handler;
import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
public class BluetoothFinder {
@@ -69,9 +71,9 @@ public class BluetoothFinder {
@Override
public void onReceive(Context context, Intent aIntent) {
if (aIntent.getAction().equals(BluetoothDevice.ACTION_FOUND)) {
- System.out.println("Found");
BluetoothDevice aDevice = (BluetoothDevice) aIntent.getExtras()
.get(BluetoothDevice.EXTRA_DEVICE);
+ Log.i(Globals.TAG, "BluetoothFinder.onReceive: found " + aDevice.getName() + " at " + aDevice.getAddress());
Server aServer = new Server(Protocol.BLUETOOTH,
aDevice.getAddress(), aDevice.getName(),
System.currentTimeMillis());
@@ -92,8 +94,8 @@ public class BluetoothFinder {
aHandler.postDelayed(new Runnable() {
@Override
public void run() {
- System.out.println("Looping");
-
+ // Looping, huh?
+ Log.i(Globals.TAG, "BluetothFinder: looping");
}
}, 1000 * 15);
}
@@ -103,4 +105,4 @@ public class BluetoothFinder {
};
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
index 3da5154..595d643 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
@@ -15,10 +15,13 @@ import java.net.Socket;
import java.net.UnknownHostException;
import java.util.Random;
+import org.libreoffice.impressremote.Globals;
+
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
/**
* Standard Network client. Connects to a server using Sockets.
@@ -84,9 +87,9 @@ public class NetworkClient extends Client {
while (mReader.readLine().length() != 0) {
// Get rid of extra lines
- System.out.println("SF: empty line");
+ Log.i(Globals.TAG, "NetworkClient: extra line");
}
- System.out.println("SD: empty");
+ Log.i(Globals.TAG, "NetworkClient: calling startListening");
startListening();
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
index 70bfa60..bd15c43 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
@@ -17,11 +17,13 @@ import java.net.SocketException;
import java.util.Collection;
import java.util.HashMap;
+import org.libreoffice.impressremote.Globals;
import org.libreoffice.impressremote.communication.Server.Protocol;
import android.content.Context;
import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
public class ServerFinder {
@@ -78,7 +80,7 @@ public class ServerFinder {
.getAddress().getHostAddress(), aName,
System.currentTimeMillis());
mServerList.put(aServer.getAddress(), aServer);
- System.out.println("Contains:<<" + aName + ">>");
+ Log.i(Globals.TAG, "ServerFinder.listenForServer: contains " + aName);
notifyActivity();
} catch (java.net.SocketTimeoutException e) {
@@ -161,7 +163,7 @@ public class ServerFinder {
private void checkAndAddEmulator() {
try {
if (InetAddress.getByName("10.0.2.2").isReachable(100)) {
- System.out.println("NulledNot");
+ Log.i(Globals.TAG, "ServerFinder.checkAndAddEmulator: NulledNot, whatever that is supposed to mean");
Server aServer = new Server(Protocol.NETWORK, "10.0.2.2",
"Android Emulator Host", 0);
aServer.mNoTimeout = true;
@@ -185,4 +187,4 @@ public class ServerFinder {
return mServerList.values();
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list