[Libreoffice-commits] core.git: Branch 'feature/android-remote-ng' - 3 commits - android/sdremote
Artur Dryomov
artur.dryomov at gmail.com
Tue Jul 16 18:21:14 PDT 2013
android/sdremote/AndroidManifest.xml | 45
android/sdremote/res/drawable-hdpi/action_bar_tab_selected.9.png |binary
android/sdremote/res/drawable-hdpi/action_bar_tab_selected_pressed.9.png |binary
android/sdremote/res/drawable-hdpi/action_bar_tab_unselected.9.png |binary
android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected.9.png |binary
android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected_pressed.9.png |binary
android/sdremote/res/drawable-land-hdpi/action_bar_tab_unselected.9.png |binary
android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected.9.png |binary
android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected_pressed.9.png |binary
android/sdremote/res/drawable-land-mdpi/action_bar_tab_unselected.9.png |binary
android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected.9.png |binary
android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected_pressed.9.png |binary
android/sdremote/res/drawable-land-xhdpi/action_bar_tab_unselected.9.png |binary
android/sdremote/res/drawable-mdpi/action_bar_tab_selected.9.png |binary
android/sdremote/res/drawable-mdpi/action_bar_tab_selected_pressed.9.png |binary
android/sdremote/res/drawable-mdpi/action_bar_tab_unselected.9.png |binary
android/sdremote/res/drawable-xhdpi/action_bar_tab_selected.9.png |binary
android/sdremote/res/drawable-xhdpi/action_bar_tab_selected_pressed.9.png |binary
android/sdremote/res/drawable-xhdpi/action_bar_tab_unselected.9.png |binary
android/sdremote/res/drawable/action_bar_tab.xml | 26
android/sdremote/res/drawable/actionbar_tab.xml | 26
android/sdremote/res/drawable/actionbar_thumbs.xml | 9
android/sdremote/res/drawable/actionbar_toggle.xml | 8
android/sdremote/res/drawable/clockbar_clock.xml | 11
android/sdremote/res/drawable/clockbar_countdown.xml | 11
android/sdremote/res/drawable/clockbar_stopwatch.xml | 11
android/sdremote/res/drawable/handle.xml | 9
android/sdremote/res/drawable/rectangle_black.xml | 11
android/sdremote/res/layout-land/fragment_blankscreen.xml | 55
android/sdremote/res/layout-land/fragment_presentation.xml | 59 -
android/sdremote/res/layout-v11/action_bar_computer_creation.xml | 1
android/sdremote/res/layout/activity_pairing.xml | 43
android/sdremote/res/layout/activity_presentation.xml | 14
android/sdremote/res/layout/activity_reconnect.xml | 56 -
android/sdremote/res/layout/activity_selector.xml | 72 -
android/sdremote/res/layout/activity_selector_sublayout_server.xml | 21
android/sdremote/res/layout/activity_startpresentation.xml | 22
android/sdremote/res/layout/dialog_about.xml | 83 -
android/sdremote/res/layout/dialog_addserver.xml | 56 -
android/sdremote/res/layout/fragment_blankscreen.xml | 45
android/sdremote/res/layout/fragment_presentation.xml | 48
android/sdremote/res/layout/fragment_thumbnail.xml | 14
android/sdremote/res/layout/main.xml | 13
android/sdremote/res/layout/presentation_actionbar.xml | 25
android/sdremote/res/layout/presentation_clockbar.xml | 101 -
android/sdremote/res/layout/slide_thumbnail.xml | 22
android/sdremote/res/layout/testlayout.xml | 40
android/sdremote/res/menu/actionbar_presentation.xml | 21
android/sdremote/res/menu/actionbar_selector.xml | 18
android/sdremote/res/menu/selector_activity.xml | 6
android/sdremote/res/menu/selector_contextmenu.xml | 4
android/sdremote/res/values/attrs.xml | 10
android/sdremote/res/values/colors.xml | 11
android/sdremote/res/values/strings.xml | 62 -
android/sdremote/res/values/themes.xml | 12
android/sdremote/res/xml/preferences.xml | 21
android/sdremote/src/org/libreoffice/impressremote/AboutDialogBuilder.java | 61 -
android/sdremote/src/org/libreoffice/impressremote/ActionBarTabListener.java | 46
android/sdremote/src/org/libreoffice/impressremote/ActivityChangeBroadcastProcessor.java | 64 -
android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java | 88 -
android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionActivity.java | 61 -
android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java | 277 ----
android/sdremote/src/org/libreoffice/impressremote/ComputerCreationActivity.java | 128 --
android/sdremote/src/org/libreoffice/impressremote/ComputersActivity.java | 83 -
android/sdremote/src/org/libreoffice/impressremote/ComputersAdapter.java | 65 -
android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java | 324 -----
android/sdremote/src/org/libreoffice/impressremote/Globals.java | 17
android/sdremote/src/org/libreoffice/impressremote/Intents.java | 136 --
android/sdremote/src/org/libreoffice/impressremote/LicensesActivity.java | 66 -
android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java | 116 --
android/sdremote/src/org/libreoffice/impressremote/Preferences.java | 63 -
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java | 559 ----------
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java | 311 -----
android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java | 412 -------
android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java | 39
android/sdremote/src/org/libreoffice/impressremote/SlideShowActivity.java | 104 -
android/sdremote/src/org/libreoffice/impressremote/SlidesGridAdapter.java | 108 -
android/sdremote/src/org/libreoffice/impressremote/SlidesGridFragment.java | 170 ---
android/sdremote/src/org/libreoffice/impressremote/SlidesPagerAdapter.java | 62 -
android/sdremote/src/org/libreoffice/impressremote/SlidesPagerFragment.java | 189 ---
android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java | 117 --
android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java | 229 ----
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java | 64 +
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java | 131 ++
android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java | 87 +
android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java | 67 +
android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java | 117 ++
android/sdremote/src/org/libreoffice/impressremote/adapter/ComputersAdapter.java | 66 +
android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java | 110 +
android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java | 73 +
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java | 2
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java | 4
android/sdremote/src/org/libreoffice/impressremote/communication/CommandsTransmitter.java | 2
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java | 7
android/sdremote/src/org/libreoffice/impressremote/communication/MessagesListener.java | 2
android/sdremote/src/org/libreoffice/impressremote/communication/MessagesReceiver.java | 6
android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java | 18
android/sdremote/src/org/libreoffice/impressremote/communication/Protocol.java | 6
android/sdremote/src/org/libreoffice/impressremote/communication/ReconnectionActivity.java | 108 -
android/sdremote/src/org/libreoffice/impressremote/communication/Server.java | 50
android/sdremote/src/org/libreoffice/impressremote/communication/ServerConnection.java | 2
android/sdremote/src/org/libreoffice/impressremote/communication/ServersFinder.java | 2
android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java | 4
android/sdremote/src/org/libreoffice/impressremote/communication/TcpServerConnection.java | 2
android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java | 4
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java | 279 ++++
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java | 326 +++++
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java | 173 +++
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java | 192 +++
android/sdremote/src/org/libreoffice/impressremote/util/ActionBarTabListener.java | 46
android/sdremote/src/org/libreoffice/impressremote/util/Intents.java | 139 ++
android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java | 59 +
android/sdremote/src/pl/polidea/coverflow/AbstractCoverFlowImageAdapter.java | 120 --
android/sdremote/src/pl/polidea/coverflow/CoverFlow.java | 387 ------
android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java | 145 --
android/sdremote/src/pl/polidea/coverflow/ResourceImageAdapter.java | 109 -
dev/null |binary
117 files changed, 2009 insertions(+), 5917 deletions(-)
New commits:
commit f4690bc6be9eebec6edea6ec737840b7e2da93cd
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Wed Jul 17 04:18:31 2013 +0300
Clean up the codebase.
* Fix licenses headers and footers once again.
* Fix inspection warnings.
* Fix typos.
* Rename resources to follow the same style everywhere.
Change-Id: I3ee60f4761446322bd34323f404354096292a086
diff --git a/android/sdremote/res/drawable-hdpi/actionbar_tab_selected.9.png b/android/sdremote/res/drawable-hdpi/action_bar_tab_selected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-hdpi/actionbar_tab_selected.9.png
rename to android/sdremote/res/drawable-hdpi/action_bar_tab_selected.9.png
diff --git a/android/sdremote/res/drawable-hdpi/actionbar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-hdpi/action_bar_tab_selected_pressed.9.png
similarity index 100%
rename from android/sdremote/res/drawable-hdpi/actionbar_tab_selected_pressed.9.png
rename to android/sdremote/res/drawable-hdpi/action_bar_tab_selected_pressed.9.png
diff --git a/android/sdremote/res/drawable-hdpi/actionbar_tab_unselected.9.png b/android/sdremote/res/drawable-hdpi/action_bar_tab_unselected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-hdpi/actionbar_tab_unselected.9.png
rename to android/sdremote/res/drawable-hdpi/action_bar_tab_unselected.9.png
diff --git a/android/sdremote/res/drawable-land-hdpi/actionbar_tab_selected.9.png b/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-land-hdpi/actionbar_tab_selected.9.png
rename to android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected.9.png
diff --git a/android/sdremote/res/drawable-land-hdpi/actionbar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected_pressed.9.png
similarity index 100%
rename from android/sdremote/res/drawable-land-hdpi/actionbar_tab_selected_pressed.9.png
rename to android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected_pressed.9.png
diff --git a/android/sdremote/res/drawable-land-hdpi/actionbar_tab_unselected.9.png b/android/sdremote/res/drawable-land-hdpi/action_bar_tab_unselected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-land-hdpi/actionbar_tab_unselected.9.png
rename to android/sdremote/res/drawable-land-hdpi/action_bar_tab_unselected.9.png
diff --git a/android/sdremote/res/drawable-land-mdpi/actionbar_tab_selected.9.png b/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-land-mdpi/actionbar_tab_selected.9.png
rename to android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected.9.png
diff --git a/android/sdremote/res/drawable-land-mdpi/actionbar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected_pressed.9.png
similarity index 100%
rename from android/sdremote/res/drawable-land-mdpi/actionbar_tab_selected_pressed.9.png
rename to android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected_pressed.9.png
diff --git a/android/sdremote/res/drawable-land-mdpi/actionbar_tab_unselected.9.png b/android/sdremote/res/drawable-land-mdpi/action_bar_tab_unselected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-land-mdpi/actionbar_tab_unselected.9.png
rename to android/sdremote/res/drawable-land-mdpi/action_bar_tab_unselected.9.png
diff --git a/android/sdremote/res/drawable-land-xhdpi/actionbar_tab_selected.9.png b/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-land-xhdpi/actionbar_tab_selected.9.png
rename to android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected.9.png
diff --git a/android/sdremote/res/drawable-land-xhdpi/actionbar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected_pressed.9.png
similarity index 100%
rename from android/sdremote/res/drawable-land-xhdpi/actionbar_tab_selected_pressed.9.png
rename to android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected_pressed.9.png
diff --git a/android/sdremote/res/drawable-land-xhdpi/actionbar_tab_unselected.9.png b/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_unselected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-land-xhdpi/actionbar_tab_unselected.9.png
rename to android/sdremote/res/drawable-land-xhdpi/action_bar_tab_unselected.9.png
diff --git a/android/sdremote/res/drawable-mdpi/actionbar_tab_selected.9.png b/android/sdremote/res/drawable-mdpi/action_bar_tab_selected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-mdpi/actionbar_tab_selected.9.png
rename to android/sdremote/res/drawable-mdpi/action_bar_tab_selected.9.png
diff --git a/android/sdremote/res/drawable-mdpi/actionbar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-mdpi/action_bar_tab_selected_pressed.9.png
similarity index 100%
rename from android/sdremote/res/drawable-mdpi/actionbar_tab_selected_pressed.9.png
rename to android/sdremote/res/drawable-mdpi/action_bar_tab_selected_pressed.9.png
diff --git a/android/sdremote/res/drawable-mdpi/actionbar_tab_unselected.9.png b/android/sdremote/res/drawable-mdpi/action_bar_tab_unselected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-mdpi/actionbar_tab_unselected.9.png
rename to android/sdremote/res/drawable-mdpi/action_bar_tab_unselected.9.png
diff --git a/android/sdremote/res/drawable-xhdpi/actionbar_tab_selected.9.png b/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-xhdpi/actionbar_tab_selected.9.png
rename to android/sdremote/res/drawable-xhdpi/action_bar_tab_selected.9.png
diff --git a/android/sdremote/res/drawable-xhdpi/actionbar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected_pressed.9.png
similarity index 100%
rename from android/sdremote/res/drawable-xhdpi/actionbar_tab_selected_pressed.9.png
rename to android/sdremote/res/drawable-xhdpi/action_bar_tab_selected_pressed.9.png
diff --git a/android/sdremote/res/drawable-xhdpi/actionbar_tab_unselected.9.png b/android/sdremote/res/drawable-xhdpi/action_bar_tab_unselected.9.png
similarity index 100%
rename from android/sdremote/res/drawable-xhdpi/actionbar_tab_unselected.9.png
rename to android/sdremote/res/drawable-xhdpi/action_bar_tab_unselected.9.png
diff --git a/android/sdremote/res/drawable/actionbar_tab.xml b/android/sdremote/res/drawable/action_bar_tab.xml
similarity index 65%
rename from android/sdremote/res/drawable/actionbar_tab.xml
rename to android/sdremote/res/drawable/action_bar_tab.xml
index db9ef14..45b26dd 100644
--- a/android/sdremote/res/drawable/actionbar_tab.xml
+++ b/android/sdremote/res/drawable/action_bar_tab.xml
@@ -5,22 +5,22 @@
android:state_focused="false"
android:state_selected="false"
android:state_pressed="false"
- android:drawable="@drawable/actionbar_tab_unselected"/>
+ android:drawable="@drawable/action_bar_tab_unselected"/>
<item
android:state_focused="false"
android:state_selected="true"
android:state_pressed="false"
- android:drawable="@drawable/actionbar_tab_selected"/>
+ android:drawable="@drawable/action_bar_tab_selected"/>
<item
android:state_selected="false"
android:state_pressed="true"
- android:drawable="@drawable/actionbar_tab_selected_pressed"/>
+ android:drawable="@drawable/action_bar_tab_selected_pressed"/>
<item
android:state_selected="true"
android:state_pressed="true"
- android:drawable="@drawable/actionbar_tab_selected_pressed"/>
+ android:drawable="@drawable/action_bar_tab_selected_pressed"/>
</selector>
\ No newline at end of file
diff --git a/android/sdremote/res/layout-v11/action_bar_computer_creation.xml b/android/sdremote/res/layout-v11/action_bar_computer_creation.xml
index 0c7c5c8..20f1e29 100644
--- a/android/sdremote/res/layout-v11/action_bar_computer_creation.xml
+++ b/android/sdremote/res/layout-v11/action_bar_computer_creation.xml
@@ -4,6 +4,7 @@
android:divider="?android:attr/dividerVertical"
android:showDividers="middle"
android:dividerPadding="@dimen/padding_horizontal_action_bar_divider"
+ android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/android/sdremote/res/values/themes.xml b/android/sdremote/res/values/themes.xml
index a7e9ad5..da70aa8 100644
--- a/android/sdremote/res/values/themes.xml
+++ b/android/sdremote/res/values/themes.xml
@@ -18,8 +18,8 @@
</style>
<style name="Theme.ImpressRemote.ActionBar.Tab" parent="Widget.Sherlock.Light.ActionBar.TabView.Inverse">
- <item name="android:background">@drawable/actionbar_tab</item>
- <item name="background">@drawable/actionbar_tab</item>
+ <item name="android:background">@drawable/action_bar_tab</item>
+ <item name="background">@drawable/action_bar_tab</item>
</style>
<style name="Theme.ImpressRemote.Computers" parent="Theme.ImpressRemote">
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
index a1c371b..87c4a94 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
@@ -1,3 +1,11 @@
+/* -*- 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.activity;
import android.os.Bundle;
@@ -105,3 +113,5 @@ public class SlideShowActivity extends SherlockFragmentActivity {
supportInvalidateOptionsMenu();
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
index 658e4fa..9aec981 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
@@ -1,3 +1,11 @@
+/* -*- 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.adapter;
import android.content.Context;
@@ -61,3 +69,5 @@ public class SlidesPagerAdapter extends PagerAdapter {
return POSITION_NONE;
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
index baf75e5..6ecaabe 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
@@ -17,7 +17,7 @@ import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothSocket;
-public class BluetoothServerConnection implements ServerConnection {
+class BluetoothServerConnection implements ServerConnection {
// Standard UUID for the Serial Port Profile.
// https://www.bluetooth.org/en-us/specification/assigned-numbers-overview/service-discovery
private static final String STANDARD_SPP_UUID = "00001101-0000-1000-8000-00805F9B34FB";
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
index a95573b..60cf3df 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
@@ -25,7 +25,7 @@ import android.support.v4.content.LocalBroadcastManager;
import org.libreoffice.impressremote.util.Intents;
import org.libreoffice.impressremote.communication.Server.Protocol;
-public class BluetoothServersFinder extends BroadcastReceiver implements ServersFinder, Runnable {
+class BluetoothServersFinder extends BroadcastReceiver implements ServersFinder, Runnable {
private static final int SEARCH_DELAY_IN_MILLISECONDS = 1000 * 10;
private final Context mContext;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommandsTransmitter.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommandsTransmitter.java
index 1947021..ebe417c 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommandsTransmitter.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommandsTransmitter.java
@@ -59,7 +59,7 @@ public class CommandsTransmitter {
public void setCurrentSlide(int slideIndex) {
writeCommand(Protocol.Commands
- .prepareCommand(Protocol.Commands.GOTO_SLIDE,
+ .prepareCommand(Protocol.Commands.GO_TO_SLIDE,
Integer.toString(slideIndex)));
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index 3e92091..2e32813 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -213,11 +213,6 @@ public class CommunicationService extends Service implements Runnable, MessagesL
return mSlideShow;
}
- @Deprecated
- public void addServer(String aAddress, String aName, boolean aRemember) {
- mServersManager.addTcpServer(aAddress, aName);
- }
-
public void addServer(String aAddress, String aName) {
mServersManager.addTcpServer(aAddress, aName);
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/MessagesListener.java b/android/sdremote/src/org/libreoffice/impressremote/communication/MessagesListener.java
index ffad6b9..a8f9237 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/MessagesListener.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/MessagesListener.java
@@ -8,7 +8,7 @@
*/
package org.libreoffice.impressremote.communication;
-public interface MessagesListener {
+interface MessagesListener {
public void onPinValidation();
public void onSuccessfulPairing();
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/MessagesReceiver.java b/android/sdremote/src/org/libreoffice/impressremote/communication/MessagesReceiver.java
index ab65dd4..4d226d8 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/MessagesReceiver.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/MessagesReceiver.java
@@ -19,7 +19,7 @@ import java.util.List;
import android.text.TextUtils;
import android.util.Base64;
-public class MessagesReceiver implements Runnable {
+class MessagesReceiver implements Runnable {
private final BufferedReader mMessagesReader;
private final MessagesListener mMessagesListener;
@@ -108,7 +108,7 @@ public class MessagesReceiver implements Runnable {
return;
}
- if (Protocol.Messages.SLIDESHOW_STARTED.equals(aMessageType)) {
+ if (Protocol.Messages.SLIDE_SHOW_STARTED.equals(aMessageType)) {
int aSlidesCount = parseSlidesCount(aMessage, 1);
int aCurrentSlideIndex = parseSlideIndex(aMessage, 2);
@@ -116,7 +116,7 @@ public class MessagesReceiver implements Runnable {
return;
}
- if (Protocol.Messages.SLIDESHOW_FINISHED.equals(aMessageType)) {
+ if (Protocol.Messages.SLIDE_SHOW_FINISHED.equals(aMessageType)) {
mMessagesListener.onSlideShowFinish();
return;
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java b/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
index 9ab6646..7329fd2 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
@@ -1,3 +1,11 @@
+/* -*- 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.communication;
import android.bluetooth.BluetoothAdapter;
@@ -6,8 +14,8 @@ import android.os.Build;
import org.libreoffice.impressremote.util.Preferences;
-public final class PairingProvider {
- private Context mContext;
+final class PairingProvider {
+ private final Context mContext;
private PairingProvider(Context aContext) {
mContext = aContext;
@@ -55,7 +63,7 @@ public final class PairingProvider {
return new PairingProvider(aContext).getPairingDeviceName();
}
- public String getPairingDeviceName() {
+ private String getPairingDeviceName() {
if (BluetoothAdapter.getDefaultAdapter() == null) {
return Build.MODEL;
}
@@ -67,3 +75,5 @@ public final class PairingProvider {
return BluetoothAdapter.getDefaultAdapter().getName();
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Protocol.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Protocol.java
index c276ec9..daaeac7 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/Protocol.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Protocol.java
@@ -56,8 +56,8 @@ final class Protocol {
public static final String VALIDATING = "LO_SERVER_VALIDATING_PIN";
public static final String ADVERTISE = "LOREMOTE_ADVERTISE";
- public static final String SLIDESHOW_STARTED = "slideshow_started";
- public static final String SLIDESHOW_FINISHED = "slideshow_finished";
+ public static final String SLIDE_SHOW_STARTED = "slideshow_started";
+ public static final String SLIDE_SHOW_FINISHED = "slideshow_finished";
public static final String SLIDE_UPDATED = "slide_updated";
public static final String SLIDE_PREVIEW = "slide_preview";
public static final String SLIDE_NOTES = "slide_notes";
@@ -72,7 +72,7 @@ final class Protocol {
public static final String TRANSITION_NEXT = "transition_next";
public static final String TRANSITION_PREVIOUS = "transition_previous";
- public static final String GOTO_SLIDE = "goto_slide";
+ public static final String GO_TO_SLIDE = "goto_slide";
public static final String PRESENTATION_BLANK_SCREEN = "presentation_blank_screen";
public static final String PRESENTATION_RESUME = "presentation_resume";
public static final String PRESENTATION_START = "presentation_start";
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
index a96ee42..bc11d92 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
@@ -21,26 +21,11 @@ public class Server implements Parcelable {
private final Protocol mProtocol;
private final String mAddress;
private final String mName;
- private final long mTimeDiscovered;
-
- /**
- * Signifies a Server that shouldn't be automatically removed from the list.
- * Used e.g. for the emulator.
- */
- protected boolean mNoTimeout = false;
-
- protected Server(Protocol aProtocol, String aAddress, String aName, long aTimeDiscovered) {
- this.mProtocol = aProtocol;
- this.mAddress = aAddress;
- this.mName = aName;
- this.mTimeDiscovered = aTimeDiscovered;
- }
public Server(Protocol aProtocol, String aAddress, String aName) {
this.mProtocol = aProtocol;
this.mAddress = aAddress;
this.mName = aName;
- this.mTimeDiscovered = System.currentTimeMillis();
}
public static Server newTcpInstance(String aAddress, String aName) {
@@ -59,43 +44,32 @@ public class Server implements Parcelable {
return mName;
}
- public long getTimeDiscovered() {
- return mTimeDiscovered;
- }
-
- public String toString() {
- return getClass().getName() + '@' + Integer
- .toHexString(hashCode()) + ":{" + mAddress + "," + mName + "}";
- }
-
@Override
public int describeContents() {
return SPECIAL_PARCELABLE_OBJECTS_BITMASK;
}
@Override
- public void writeToParcel(Parcel parcel, int flags) {
- parcel.writeString(mAddress);
- parcel.writeString(mName);
- parcel.writeString(mProtocol.name());
- parcel.writeLong(mTimeDiscovered);
+ public void writeToParcel(Parcel aParcel, int aFlags) {
+ aParcel.writeString(mAddress);
+ aParcel.writeString(mName);
+ aParcel.writeString(mProtocol.name());
}
public static final Parcelable.Creator<Server> CREATOR = new Parcelable.Creator<Server>() {
- public Server createFromParcel(Parcel parcel) {
- return new Server(parcel);
+ public Server createFromParcel(Parcel aParcel) {
+ return new Server(aParcel);
}
- public Server[] newArray(int size) {
- return new Server[size];
+ public Server[] newArray(int aSize) {
+ return new Server[aSize];
}
};
- private Server(Parcel parcel) {
- this.mAddress = parcel.readString();
- this.mName = parcel.readString();
- this.mProtocol = Protocol.valueOf(parcel.readString());
- this.mTimeDiscovered = parcel.readLong();
+ private Server(Parcel aParcel) {
+ this.mAddress = aParcel.readString();
+ this.mName = aParcel.readString();
+ this.mProtocol = Protocol.valueOf(aParcel.readString());
}
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerConnection.java b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerConnection.java
index fced5a0..e0bb49d 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerConnection.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerConnection.java
@@ -11,7 +11,7 @@ package org.libreoffice.impressremote.communication;
import java.io.InputStream;
import java.io.OutputStream;
-public interface ServerConnection {
+interface ServerConnection {
public InputStream buildMessagesStream();
public OutputStream buildCommandsStream();
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/ServersFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/ServersFinder.java
index aba82ab..52a3182 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/ServersFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/ServersFinder.java
@@ -10,7 +10,7 @@ package org.libreoffice.impressremote.communication;
import java.util.List;
-public interface ServersFinder {
+interface ServersFinder {
public void startSearch();
public void stopSearch();
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java b/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java
index 7f20943..388f48c 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java
@@ -19,7 +19,7 @@ import android.content.Context;
import org.libreoffice.impressremote.util.Preferences;
-public class ServersManager {
+class ServersManager {
private final Context mContext;
private final ServersFinder mBluetoothServersFinder;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServerConnection.java b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServerConnection.java
index a559a50..a37d353 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServerConnection.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServerConnection.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
-public class TcpServerConnection implements ServerConnection {
+class TcpServerConnection implements ServerConnection {
private final Socket mServerConnection;
public TcpServerConnection(Server aServer) {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
index ac0b9f1..9f50fc1 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
@@ -31,7 +31,7 @@ import android.text.TextUtils;
import org.libreoffice.impressremote.util.Intents;
-public class TcpServersFinder implements ServersFinder, Runnable {
+class TcpServersFinder implements ServersFinder, Runnable {
private static final int SEARCH_DELAY_IN_SECONDS = 10;
private static final int BLOCKING_TIMEOUT_IN_MILLISECONDS = 1000 * 10;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
index 0f1c89e..ee9c75b 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
@@ -171,7 +171,7 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv
return LocalBroadcastManager.getInstance(aContext);
}
- public void setUpPinValidationInstructions(String aPin) {
+ private void setUpPinValidationInstructions(String aPin) {
TextView aPinTextView = (TextView) getView().findViewById(R.id.text_pin);
aPinTextView.setText(aPin);
@@ -185,14 +185,14 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv
aViewAnimator.setDisplayedChild(aViewAnimator.indexOfChild(aValidationLayout));
}
- public void setUpPresentation() {
+ private void setUpPresentation() {
Intent aIntent = Intents.buildSlideShowIntent(getActivity());
startActivity(aIntent);
getActivity().finish();
}
- public void setUpErrorMessage() {
+ private void setUpErrorMessage() {
TextView aSecondaryMessageTextView = (TextView) getView().findViewById(R.id.text_secondary_error_message);
aSecondaryMessageTextView.setText(buildSecondaryErrorMessage());
diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
index 084e27c..11d2896 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
@@ -163,7 +163,7 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo
return LocalBroadcastManager.getInstance(aContext);
}
- public void loadComputers() {
+ private void loadComputers() {
if (!isServiceBound()) {
return;
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java b/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
index e834968..0491345 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
@@ -32,7 +32,6 @@ public final class Intents {
public static final String CONNECTION_FAILED = "CONNECTION_FAILED";
- public static final String SLIDE_SHOW_STARTED = "SLIDE_SHOW_STARTED";
public static final String SLIDE_SHOW_RUNNING = "SLIDE_SHOW_RUNNING";
public static final String SLIDE_SHOW_STOPPED = "SLIDE_SHOW_STOPPED";
diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
index b23e3b6..749d3ab 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
@@ -25,10 +25,6 @@ public final class Preferences {
private Preferences() {
}
- public static boolean doContain(Context aContext, String aLocation, String aKey) {
- return getPreferences(aContext, aLocation).contains(aKey);
- }
-
private static SharedPreferences getPreferences(Context aContext, String aLocation) {
return aContext.getSharedPreferences(aLocation, Context.MODE_PRIVATE);
}
commit 9155bfc8a18f42172c4e250755b302b86232e67b
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Wed Jul 17 03:27:57 2013 +0300
Change the source code structure a bit.
* Follow usual Android project structure.
* Make the structure more clean.
Change-Id: Ia5b115fe2b8a6417e6d9cfaae46c859c9e4c3c1a
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml
index 4a6a1d1..73f3c23 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -20,7 +20,7 @@
android:theme="@style/Theme.ImpressRemote">
<activity
- android:name=".ComputersActivity"
+ android:name=".activity.ComputersActivity"
android:label="@string/title_computers"
android:theme="@style/Theme.ImpressRemote.Computers">
@@ -32,23 +32,23 @@
</activity>
<activity
- android:name=".ComputerConnectionActivity"
+ android:name=".activity.ComputerConnectionActivity"
android:label="@string/title_connection">
</activity>
<activity
- android:name=".ComputerCreationActivity"
+ android:name=".activity.ComputerCreationActivity"
android:label="@string/title_creation"
android:theme="@style/Theme.ImpressRemote.ComputerCreation">
</activity>
<activity
- android:name=".SlideShowActivity"
+ android:name=".activity.SlideShowActivity"
android:label="@string/title_slide_show">
</activity>
<activity
- android:name=".LicensesActivity"
+ android:name=".activity.LicensesActivity"
android:label="@string/title_licenses">
</activity>
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
similarity index 88%
rename from android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionActivity.java
rename to android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
index 488e206..279eaae 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
@@ -6,13 +6,15 @@
* 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;
+package org.libreoffice.impressremote.activity;
import android.os.Bundle;
import android.support.v4.app.FragmentTransaction;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.MenuItem;
+import org.libreoffice.impressremote.fragment.ComputerConnectionFragment;
+import org.libreoffice.impressremote.util.Intents;
import org.libreoffice.impressremote.communication.Server;
public class ComputerConnectionActivity extends SherlockFragmentActivity {
@@ -32,7 +34,8 @@ public class ComputerConnectionActivity extends SherlockFragmentActivity {
private void setUpComputerConnectionFragment(Server aComputer) {
FragmentTransaction aTransaction = getSupportFragmentManager().beginTransaction();
- aTransaction.replace(android.R.id.content, ComputerConnectionFragment.newInstance(aComputer));
+ aTransaction.replace(android.R.id.content, ComputerConnectionFragment
+ .newInstance(aComputer));
aTransaction.commit();
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputerCreationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
similarity index 94%
rename from android/sdremote/src/org/libreoffice/impressremote/ComputerCreationActivity.java
rename to android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
index 605838e..76f33c6 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ComputerCreationActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.activity;
import android.app.Activity;
import android.content.Context;
@@ -21,6 +21,8 @@ import android.widget.EditText;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
+import org.libreoffice.impressremote.util.Intents;
+import org.libreoffice.impressremote.R;
public class ComputerCreationActivity extends SherlockFragmentActivity implements View.OnClickListener {
@Override
@@ -118,7 +120,8 @@ public class ComputerCreationActivity extends SherlockFragmentActivity implement
}
private void finish(String aIpAddress, String aName) {
- Intent aIntent = Intents.buildComputerCreationResultIntent(aIpAddress, aName);
+ Intent aIntent = Intents
+ .buildComputerCreationResultIntent(aIpAddress, aName);
setResult(Activity.RESULT_OK, aIntent);
finish();
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputersActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
similarity index 90%
rename from android/sdremote/src/org/libreoffice/impressremote/ComputersActivity.java
rename to android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
index c337c94..14ace70 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ComputersActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.activity;
import android.content.Intent;
import android.os.Bundle;
@@ -16,6 +16,10 @@ import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
+import org.libreoffice.impressremote.util.ActionBarTabListener;
+import org.libreoffice.impressremote.fragment.ComputersFragment;
+import org.libreoffice.impressremote.util.Intents;
+import org.libreoffice.impressremote.R;
public class ComputersActivity extends SherlockFragmentActivity {
@Override
diff --git a/android/sdremote/src/org/libreoffice/impressremote/LicensesActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java
similarity index 95%
rename from android/sdremote/src/org/libreoffice/impressremote/LicensesActivity.java
rename to android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java
index f9805aa..5b74de3 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/LicensesActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.activity;
import android.content.ContentResolver;
import android.os.Bundle;
@@ -14,6 +14,7 @@ import android.webkit.WebView;
import com.actionbarsherlock.app.SherlockActivity;
import com.actionbarsherlock.view.MenuItem;
+import org.libreoffice.impressremote.R;
public class LicensesActivity extends SherlockActivity {
private static final String SCHEME = ContentResolver.SCHEME_FILE;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlideShowActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
similarity index 92%
rename from android/sdremote/src/org/libreoffice/impressremote/SlideShowActivity.java
rename to android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
index 77cf703..a1c371b 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SlideShowActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
@@ -1,4 +1,4 @@
-package org.libreoffice.impressremote;
+package org.libreoffice.impressremote.activity;
import android.os.Bundle;
import android.support.v4.app.Fragment;
@@ -7,6 +7,9 @@ import android.support.v4.app.FragmentTransaction;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
+import org.libreoffice.impressremote.R;
+import org.libreoffice.impressremote.fragment.SlidesGridFragment;
+import org.libreoffice.impressremote.fragment.SlidesPagerFragment;
public class SlideShowActivity extends SherlockFragmentActivity {
private static enum Mode {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputersAdapter.java b/android/sdremote/src/org/libreoffice/impressremote/adapter/ComputersAdapter.java
similarity index 95%
rename from android/sdremote/src/org/libreoffice/impressremote/ComputersAdapter.java
rename to android/sdremote/src/org/libreoffice/impressremote/adapter/ComputersAdapter.java
index f3080f1..ea9010a 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ComputersAdapter.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/adapter/ComputersAdapter.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.adapter;
import java.util.List;
@@ -17,6 +17,7 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.TextView;
+import org.libreoffice.impressremote.R;
import org.libreoffice.impressremote.communication.Server;
public class ComputersAdapter extends ArrayAdapter<Server> {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlidesGridAdapter.java b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
similarity index 94%
rename from android/sdremote/src/org/libreoffice/impressremote/SlidesGridAdapter.java
rename to android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
index 3ccfb51..45ccb55 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SlidesGridAdapter.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.adapter;
import android.content.Context;
import android.view.LayoutInflater;
@@ -16,6 +16,7 @@ import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.TextView;
+import org.libreoffice.impressremote.R;
import org.libreoffice.impressremote.communication.SlideShow;
public class SlidesGridAdapter extends BaseAdapter {
@@ -56,7 +57,8 @@ public class SlidesGridAdapter extends BaseAdapter {
if (isSlidePreviewAvailable(aPosition)) {
aSlideViewHolder.aSlidePreview.setImageBitmap(mSlideShow.getSlidePreview(aPosition));
} else {
- aSlideViewHolder.aSlidePreview.setImageResource(R.drawable.slide_unknown);
+ aSlideViewHolder.aSlidePreview.setImageResource(
+ R.drawable.slide_unknown);
}
aSlideViewHolder.aSlideIndex.setText(buildSlideIndex(aPosition));
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlidesPagerAdapter.java b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
similarity index 95%
rename from android/sdremote/src/org/libreoffice/impressremote/SlidesPagerAdapter.java
rename to android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
index bb7065f..658e4fa 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SlidesPagerAdapter.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
@@ -1,4 +1,4 @@
-package org.libreoffice.impressremote;
+package org.libreoffice.impressremote.adapter;
import android.content.Context;
import android.support.v4.view.PagerAdapter;
@@ -7,6 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import org.libreoffice.impressremote.R;
import org.libreoffice.impressremote.communication.SlideShow;
public class SlidesPagerAdapter extends PagerAdapter {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
index 7828197..a95573b 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
@@ -22,7 +22,7 @@ import android.content.IntentFilter;
import android.os.Handler;
import android.support.v4.content.LocalBroadcastManager;
-import org.libreoffice.impressremote.Intents;
+import org.libreoffice.impressremote.util.Intents;
import org.libreoffice.impressremote.communication.Server.Protocol;
public class BluetoothServersFinder extends BroadcastReceiver implements ServersFinder, Runnable {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index 3bb00c5..3e92091 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -17,7 +17,7 @@ import android.os.Binder;
import android.os.IBinder;
import android.support.v4.content.LocalBroadcastManager;
-import org.libreoffice.impressremote.Intents;
+import org.libreoffice.impressremote.util.Intents;
public class CommunicationService extends Service implements Runnable, MessagesListener {
public static enum State {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java b/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
index e6550fb..9ab6646 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
@@ -4,7 +4,7 @@ import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.os.Build;
-import org.libreoffice.impressremote.Preferences;
+import org.libreoffice.impressremote.util.Preferences;
public final class PairingProvider {
private Context mContext;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java b/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java
index d9363d5..7f20943 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java
@@ -17,7 +17,7 @@ import java.util.Set;
import android.content.Context;
-import org.libreoffice.impressremote.Preferences;
+import org.libreoffice.impressremote.util.Preferences;
public class ServersManager {
private final Context mContext;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
index ef8f607..ac0b9f1 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
@@ -29,7 +29,7 @@ import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils;
-import org.libreoffice.impressremote.Intents;
+import org.libreoffice.impressremote.util.Intents;
public class TcpServersFinder implements ServersFinder, Runnable {
private static final int SEARCH_DELAY_IN_SECONDS = 10;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
similarity index 98%
rename from android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java
rename to android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
index a9a52a1..0f1c89e 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.fragment;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -29,6 +29,8 @@ import com.actionbarsherlock.app.SherlockFragment;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
+import org.libreoffice.impressremote.util.Intents;
+import org.libreoffice.impressremote.R;
import org.libreoffice.impressremote.communication.CommunicationService;
import org.libreoffice.impressremote.communication.Server;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
similarity index 97%
rename from android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java
rename to android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
index 20a289a..084e27c 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.fragment;
import java.util.ArrayList;
import java.util.List;
@@ -27,8 +27,10 @@ import android.widget.AdapterView;
import android.widget.ListView;
import com.actionbarsherlock.app.SherlockListFragment;
-import com.actionbarsherlock.internal.view.menu.ActionMenu;
import com.actionbarsherlock.view.MenuItem;
+import org.libreoffice.impressremote.adapter.ComputersAdapter;
+import org.libreoffice.impressremote.util.Intents;
+import org.libreoffice.impressremote.R;
import org.libreoffice.impressremote.communication.CommunicationService;
import org.libreoffice.impressremote.communication.Server;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlidesGridFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
similarity index 96%
rename from android/sdremote/src/org/libreoffice/impressremote/SlidesGridFragment.java
rename to android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
index b16b509..6c0fe87 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SlidesGridFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.fragment;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -24,6 +24,9 @@ import android.widget.AdapterView;
import android.widget.GridView;
import com.actionbarsherlock.app.SherlockFragment;
+import org.libreoffice.impressremote.util.Intents;
+import org.libreoffice.impressremote.R;
+import org.libreoffice.impressremote.adapter.SlidesGridAdapter;
import org.libreoffice.impressremote.communication.CommunicationService;
public class SlidesGridFragment extends SherlockFragment implements ServiceConnection, AdapterView.OnItemClickListener {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlidesPagerFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
similarity index 96%
rename from android/sdremote/src/org/libreoffice/impressremote/SlidesPagerFragment.java
rename to android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
index fd1ea3c..c3ebb2c 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SlidesPagerFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.fragment;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -24,6 +24,9 @@ import android.view.View;
import android.view.ViewGroup;
import com.actionbarsherlock.app.SherlockFragment;
+import org.libreoffice.impressremote.util.Intents;
+import org.libreoffice.impressremote.R;
+import org.libreoffice.impressremote.adapter.SlidesPagerAdapter;
import org.libreoffice.impressremote.communication.CommunicationService;
public class SlidesPagerFragment extends SherlockFragment implements ServiceConnection, ViewPager.OnPageChangeListener {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ActionBarTabListener.java b/android/sdremote/src/org/libreoffice/impressremote/util/ActionBarTabListener.java
similarity index 96%
rename from android/sdremote/src/org/libreoffice/impressremote/ActionBarTabListener.java
rename to android/sdremote/src/org/libreoffice/impressremote/util/ActionBarTabListener.java
index 66e15b9..e21911a 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ActionBarTabListener.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/ActionBarTabListener.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.util;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/Intents.java b/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
similarity index 93%
rename from android/sdremote/src/org/libreoffice/impressremote/Intents.java
rename to android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
index e517c2d..e834968 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/Intents.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
@@ -6,11 +6,15 @@
* 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;
+package org.libreoffice.impressremote.util;
import android.content.Context;
import android.content.Intent;
+import org.libreoffice.impressremote.activity.ComputerConnectionActivity;
+import org.libreoffice.impressremote.activity.ComputerCreationActivity;
+import org.libreoffice.impressremote.activity.LicensesActivity;
+import org.libreoffice.impressremote.activity.SlideShowActivity;
import org.libreoffice.impressremote.communication.Server;
public final class Intents {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/Preferences.java b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
similarity index 97%
rename from android/sdremote/src/org/libreoffice/impressremote/Preferences.java
rename to android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
index 937d706..b23e3b6 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/Preferences.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
@@ -6,7 +6,7 @@
* 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;
+package org.libreoffice.impressremote.util;
import java.util.Map;
commit 3c586031bc0b039ad458360f9f39b0e682273ac1
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Wed Jul 17 03:10:27 2013 +0300
Remove legacy and unused code.
Change-Id: I9c126628cd8e73c162e561d23bd884c1af26404a
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml
index c2f9ed4..4a6a1d1 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -48,45 +48,12 @@
</activity>
<activity
- android:name=".SelectorActivity"
- android:label="@string/selector_choose_a_computer"
- android:uiOptions="splitActionBarWhenNarrow">
- </activity>
-
- <activity
- android:name=".PairingActivity"
- android:noHistory="true">
- </activity>
-
- <activity
- android:name=".StartPresentationActivity"
- android:label="@string/startpresentation_title">
- </activity>
-
- <activity
- android:name=".PresentationActivity"
- android:label="@string/title_activity_presentation">
- </activity>
-
- <activity
- android:name=".SettingsActivity"
- android:icon="@drawable/icon_options"
- android:label="@string/options">
- </activity>
-
- <activity
- android:name=".communication.ReconnectionActivity"
- android:label="@string/reconnect">
- </activity>
-
- <activity
android:name=".LicensesActivity"
android:label="@string/title_licenses">
</activity>
<service
- android:name=".communication.CommunicationService"
- android:label="@string/startpresentation_title">
+ android:name=".communication.CommunicationService">
</service>
</application>
diff --git a/android/sdremote/res/drawable-hdpi/handle_default.9.png b/android/sdremote/res/drawable-hdpi/handle_default.9.png
deleted file mode 100644
index d978f95..0000000
Binary files a/android/sdremote/res/drawable-hdpi/handle_default.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-hdpi/handle_light.9.png b/android/sdremote/res/drawable-hdpi/handle_light.9.png
deleted file mode 100644
index 7d1b1c9..0000000
Binary files a/android/sdremote/res/drawable-hdpi/handle_light.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-land-hdpi/handle_default.9.png b/android/sdremote/res/drawable-land-hdpi/handle_default.9.png
deleted file mode 100644
index 830493c..0000000
Binary files a/android/sdremote/res/drawable-land-hdpi/handle_default.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-land-hdpi/handle_light.9.png b/android/sdremote/res/drawable-land-hdpi/handle_light.9.png
deleted file mode 100644
index 1db41c1..0000000
Binary files a/android/sdremote/res/drawable-land-hdpi/handle_light.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-land-ldpi/handle_default.9.png b/android/sdremote/res/drawable-land-ldpi/handle_default.9.png
deleted file mode 100644
index 830493c..0000000
Binary files a/android/sdremote/res/drawable-land-ldpi/handle_default.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-land-ldpi/handle_light.9.png b/android/sdremote/res/drawable-land-ldpi/handle_light.9.png
deleted file mode 100644
index 1db41c1..0000000
Binary files a/android/sdremote/res/drawable-land-ldpi/handle_light.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-land-mdpi/handle_default.9.png b/android/sdremote/res/drawable-land-mdpi/handle_default.9.png
deleted file mode 100644
index 830493c..0000000
Binary files a/android/sdremote/res/drawable-land-mdpi/handle_default.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-land-mdpi/handle_light.9.png b/android/sdremote/res/drawable-land-mdpi/handle_light.9.png
deleted file mode 100644
index 1db41c1..0000000
Binary files a/android/sdremote/res/drawable-land-mdpi/handle_light.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-ldpi/handle_default.9.png b/android/sdremote/res/drawable-ldpi/handle_default.9.png
deleted file mode 100644
index d978f95..0000000
Binary files a/android/sdremote/res/drawable-ldpi/handle_default.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-ldpi/handle_light.9.png b/android/sdremote/res/drawable-ldpi/handle_light.9.png
deleted file mode 100644
index b0d7bef..0000000
Binary files a/android/sdremote/res/drawable-ldpi/handle_light.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-mdpi/handle_default.9.png b/android/sdremote/res/drawable-mdpi/handle_default.9.png
deleted file mode 100644
index d978f95..0000000
Binary files a/android/sdremote/res/drawable-mdpi/handle_default.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-mdpi/handle_light.9.png b/android/sdremote/res/drawable-mdpi/handle_light.9.png
deleted file mode 100644
index b0d7bef..0000000
Binary files a/android/sdremote/res/drawable-mdpi/handle_light.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-mdpi/handle_vertical_default.9.png b/android/sdremote/res/drawable-mdpi/handle_vertical_default.9.png
deleted file mode 100644
index 830493c..0000000
Binary files a/android/sdremote/res/drawable-mdpi/handle_vertical_default.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-mdpi/handle_vertical_light.9.png b/android/sdremote/res/drawable-mdpi/handle_vertical_light.9.png
deleted file mode 100644
index 8246c39..0000000
Binary files a/android/sdremote/res/drawable-mdpi/handle_vertical_light.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-xhdpi/handle_default.9.png b/android/sdremote/res/drawable-xhdpi/handle_default.9.png
deleted file mode 100644
index d978f95..0000000
Binary files a/android/sdremote/res/drawable-xhdpi/handle_default.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-xhdpi/handle_light.9.png b/android/sdremote/res/drawable-xhdpi/handle_light.9.png
deleted file mode 100644
index b0d7bef..0000000
Binary files a/android/sdremote/res/drawable-xhdpi/handle_light.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-xhdpi/handle_vertical_default.9.png b/android/sdremote/res/drawable-xhdpi/handle_vertical_default.9.png
deleted file mode 100644
index 830493c..0000000
Binary files a/android/sdremote/res/drawable-xhdpi/handle_vertical_default.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-xhdpi/handle_vertical_light.9.png b/android/sdremote/res/drawable-xhdpi/handle_vertical_light.9.png
deleted file mode 100644
index 8246c39..0000000
Binary files a/android/sdremote/res/drawable-xhdpi/handle_vertical_light.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/actionbar_icon_overflow.png b/android/sdremote/res/drawable/actionbar_icon_overflow.png
deleted file mode 100644
index 5265c45..0000000
Binary files a/android/sdremote/res/drawable/actionbar_icon_overflow.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/actionbar_icon_thumbs.png b/android/sdremote/res/drawable/actionbar_icon_thumbs.png
deleted file mode 100644
index ae10acc..0000000
Binary files a/android/sdremote/res/drawable/actionbar_icon_thumbs.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/actionbar_none.png b/android/sdremote/res/drawable/actionbar_none.png
deleted file mode 100644
index d7895e5..0000000
Binary files a/android/sdremote/res/drawable/actionbar_none.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/actionbar_pressed.png b/android/sdremote/res/drawable/actionbar_pressed.png
deleted file mode 100644
index 812c92b..0000000
Binary files a/android/sdremote/res/drawable/actionbar_pressed.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/actionbar_selected.png b/android/sdremote/res/drawable/actionbar_selected.png
deleted file mode 100644
index 9c471a3..0000000
Binary files a/android/sdremote/res/drawable/actionbar_selected.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/actionbar_thumbs.xml b/android/sdremote/res/drawable/actionbar_thumbs.xml
deleted file mode 100644
index 2d03853..0000000
--- a/android/sdremote/res/drawable/actionbar_thumbs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@drawable/actionbar_toggle"/>
- <item><bitmap
- android:src="@drawable/actionbar_icon_thumbs"
- android:gravity="center" /></item>
-
-</layer-list>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/actionbar_toggle.xml b/android/sdremote/res/drawable/actionbar_toggle.xml
deleted file mode 100644
index 3f53266..0000000
--- a/android/sdremote/res/drawable/actionbar_toggle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:drawable="@drawable/actionbar_selected" android:state_checked="true" />
- <item android:drawable="@drawable/actionbar_pressed" android:state_pressed="true"/>
- <item android:drawable="@drawable/actionbar_none"/>
-
-</selector>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/clockbar_clock.xml b/android/sdremote/res/drawable/clockbar_clock.xml
deleted file mode 100644
index 14ceb47..0000000
--- a/android/sdremote/res/drawable/clockbar_clock.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@drawable/actionbar_toggle"/>
- <item>
- <bitmap
- android:gravity="center"
- android:src="@drawable/clockbar_icon_clock" />
- </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/clockbar_countdown.xml b/android/sdremote/res/drawable/clockbar_countdown.xml
deleted file mode 100644
index 129d9aa..0000000
--- a/android/sdremote/res/drawable/clockbar_countdown.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@drawable/actionbar_toggle"/>
- <item>
- <bitmap
- android:gravity="center"
- android:src="@drawable/clockbar_icon_countdown" />
- </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/clockbar_icon_clock.png b/android/sdremote/res/drawable/clockbar_icon_clock.png
deleted file mode 100644
index 792af07..0000000
Binary files a/android/sdremote/res/drawable/clockbar_icon_clock.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/clockbar_icon_countdown.png b/android/sdremote/res/drawable/clockbar_icon_countdown.png
deleted file mode 100644
index 19af041..0000000
Binary files a/android/sdremote/res/drawable/clockbar_icon_countdown.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/clockbar_icon_stopwatch.png b/android/sdremote/res/drawable/clockbar_icon_stopwatch.png
deleted file mode 100644
index ac04142..0000000
Binary files a/android/sdremote/res/drawable/clockbar_icon_stopwatch.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/clockbar_stopwatch.xml b/android/sdremote/res/drawable/clockbar_stopwatch.xml
deleted file mode 100644
index bfdab6c..0000000
--- a/android/sdremote/res/drawable/clockbar_stopwatch.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@drawable/actionbar_toggle"/>
- <item>
- <bitmap
- android:gravity="center"
- android:src="@drawable/clockbar_icon_stopwatch" />
- </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/empty.png b/android/sdremote/res/drawable/empty.png
deleted file mode 100644
index 8705a3d..0000000
Binary files a/android/sdremote/res/drawable/empty.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/handle.xml b/android/sdremote/res/drawable/handle.xml
deleted file mode 100644
index 9fda3d8..0000000
--- a/android/sdremote/res/drawable/handle.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:drawable="@drawable/handle_light" android:state_activated="true"/>
- <item android:drawable="@drawable/handle_light" android:state_pressed="true"/>
- <item android:drawable="@drawable/handle_light" android:state_focused="true"/>
- <item android:drawable="@drawable/handle_default"/>
-
-</selector>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/icon_options.png b/android/sdremote/res/drawable/icon_options.png
deleted file mode 100644
index ab79d13..0000000
Binary files a/android/sdremote/res/drawable/icon_options.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/image_loading.png b/android/sdremote/res/drawable/image_loading.png
deleted file mode 100644
index 24e8ebd..0000000
Binary files a/android/sdremote/res/drawable/image_loading.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/libreoffice_logo.9.png b/android/sdremote/res/drawable/libreoffice_logo.9.png
deleted file mode 100644
index 11bb5f2..0000000
Binary files a/android/sdremote/res/drawable/libreoffice_logo.9.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/rectangle_black.xml b/android/sdremote/res/drawable/rectangle_black.xml
deleted file mode 100644
index f854e60..0000000
--- a/android/sdremote/res/drawable/rectangle_black.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle" >
-
- <size
- android:height="240dip"
- android:width="320dip" />
-
- <solid android:color="@color/black" />
-
-</shape>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/testimage.png b/android/sdremote/res/drawable/testimage.png
deleted file mode 100644
index 4529586..0000000
Binary files a/android/sdremote/res/drawable/testimage.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/up_indicator_white.png b/android/sdremote/res/drawable/up_indicator_white.png
deleted file mode 100644
index 9a72a23..0000000
Binary files a/android/sdremote/res/drawable/up_indicator_white.png and /dev/null differ
diff --git a/android/sdremote/res/drawable/warning_exclamation.png b/android/sdremote/res/drawable/warning_exclamation.png
deleted file mode 100644
index 76b2f2d..0000000
Binary files a/android/sdremote/res/drawable/warning_exclamation.png and /dev/null differ
diff --git a/android/sdremote/res/layout-land/fragment_blankscreen.xml b/android/sdremote/res/layout-land/fragment_blankscreen.xml
deleted file mode 100644
index 3117d30..0000000
--- a/android/sdremote/res/layout-land/fragment_blankscreen.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center_vertical"
- android:layout_margin="10dip"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/blankscreen_blankimage"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:scaleType="fitXY"
- android:src="@drawable/rectangle_black" />
-
- <ImageView
- android:id="@+id/blankscreen_divider"
- android:layout_width="1dip"
- android:layout_height="fill_parent"
- android:layout_centerHorizontal="true"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="5dip"
- android:layout_toRightOf="@+id/blankscreen_blankimage"
- android:src="@color/medium_grey" />
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_alignParentRight="true"
- android:layout_gravity="center_vertical"
- android:layout_toRightOf="@id/blankscreen_divider"
- android:gravity="center"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/blankscreen_slidepreview"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="5dip"
- android:adjustViewBounds="true"
- android:scaleType="centerInside"
- android:src="@drawable/rectangle_black" />
-
- <TextView
- android:id="@+id/blankscreen_return"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="5dip"
- android:gravity="center"
- android:text="@string/blankscreen_return" />
- </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout-land/fragment_presentation.xml b/android/sdremote/res/layout-land/fragment_presentation.xml
deleted file mode 100644
index 7ac884b..0000000
--- a/android/sdremote/res/layout-land/fragment_presentation.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/presentation_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal" >
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:orientation="vertical" >
-
- <pl.polidea.coverflow.CoverFlow
- xmlns:coverflow="http://schemas.android.com/apk/res/org.libreoffice.impressremote"
- android:id="@+id/presentation_coverflow"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_margin="5dp"
- android:layout_marginLeft="15dp"
- coverflow:imageHeight="200dip"
- coverflow:imageWidth="240dip"
- coverflow:withReflection="false" />
-
- <TextView
- android:id="@+id/presentation_slidenumber"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|center_vertical"
- android:text="" />
- </LinearLayout>
-
- <ImageView
- android:id="@+id/presentation_handle"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="6dp"
- android:contentDescription="@string/presentation_ui_resizehandle"
- android:paddingBottom="5dp"
- android:paddingLeft="5dp"
- android:paddingRight="10dp"
- android:paddingTop="5dp"
- android:scaleType="fitXY"
- android:src="@drawable/handle" />
-
- <ScrollView
- android:id="@+id/presentation_scrollview"
- android:layout_width="wrap_content"
- android:layout_height="match_parent" >
-
- <WebView
- android:id="@+id/presentation_notes"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/activity_pairing.xml b/android/sdremote/res/layout/activity_pairing.xml
deleted file mode 100644
index d2f06bd..0000000
--- a/android/sdremote/res/layout/activity_pairing.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/pairing_instruction1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center"
- android:text="@string/pairing_instructions_1" />
-
- <TextView
- android:id="@+id/pairing_instruction2_deviceName"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center"
- android:text="@string/pairing_instructions_2_deviceName" />
-
- <TextView
- android:id="@+id/pairing_instruction3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:text="@string/pairing_instructions_3" />
-
- <TextView
- android:id="@+id/pairing_pin"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:text=""
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="75dip" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/activity_presentation.xml b/android/sdremote/res/layout/activity_presentation.xml
deleted file mode 100644
index 1dbf5a6..0000000
--- a/android/sdremote/res/layout/activity_presentation.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/framelayout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:keepScreenOn = "true">
-
- <view
- android:id="@+id/presentation_interceptor"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- class="org.libreoffice.impressremote.PresentationActivity$InterceptorLayout" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/activity_reconnect.xml b/android/sdremote/res/layout/activity_reconnect.xml
deleted file mode 100644
index 0d2f8bb..0000000
--- a/android/sdremote/res/layout/activity_reconnect.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_centerVertical="true"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/imageView1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:src="@drawable/warning_exclamation"
- android:layout_marginBottom="50dp" />
-
- <TextView
- android:id="@+id/textView1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
- android:gravity="center_horizontal"
- android:text="@string/reconnect_description1"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
- android:gravity="center_horizontal"
- android:text="@string/reconnect_description2"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <TextView
- android:id="@+id/countDownTV"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
- android:gravity="center_horizontal"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- </LinearLayout>
-
-</RelativeLayout>
diff --git a/android/sdremote/res/layout/activity_selector.xml b/android/sdremote/res/layout/activity_selector.xml
deleted file mode 100644
index 2c16abe..0000000
--- a/android/sdremote/res/layout/activity_selector.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="10dip" >
-
- <TextView
- android:id="@+id/selector_label_none"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/selector_noservers"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <LinearLayout
- android:id="@+id/selector_container_bluetooth"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/selector_label_bluetooth"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/bluetooth"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <ImageView
- android:id="@+id/selector_divider1"
- android:layout_width="fill_parent"
- android:layout_height="2dip"
- android:src="@color/medium_grey" />
-
- <LinearLayout
- android:id="@+id/selector_list_bluetooth"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/selector_container_network"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/selector_label_network"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/wifi"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <ImageView
- android:id="@+id/selector_divider1"
- android:layout_width="fill_parent"
- android:layout_height="2dip"
- android:src="@color/medium_grey" />
-
- <LinearLayout
- android:id="@+id/selector_list_network"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" />
- </LinearLayout>
- </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/activity_selector_sublayout_server.xml b/android/sdremote/res/layout/activity_selector_sublayout_server.xml
deleted file mode 100644
index 58a0374..0000000
--- a/android/sdremote/res/layout/activity_selector_sublayout_server.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" android:clickable="true" >
-
- <ImageView
- android:id="@+id/sub_divider"
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:src="@color/medium_grey" />
-
- <TextView
- android:id="@+id/selector_sub_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="10dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
- />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/activity_startpresentation.xml b/android/sdremote/res/layout/activity_startpresentation.xml
deleted file mode 100644
index 25bf55a..0000000
--- a/android/sdremote/res/layout/activity_startpresentation.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/startpresentation_instruction"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="5dip"
- android:text="@string/startpresentation_instruction" />
-
- <Button
- android:id="@+id/startpresentation_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:text="@string/startpresentation_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/dialog_about.xml b/android/sdremote/res/layout/dialog_about.xml
deleted file mode 100644
index 74f4474..0000000
--- a/android/sdremote/res/layout/dialog_about.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/about_root"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/imageView1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="fitXY"
- android:src="@drawable/libreoffice_logo" />
-
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/about_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center_horizontal"
- android:text="@string/application_name"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView
- android:id="@+id/about_version"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center_horizontal"
- android:text="@string/about_versionstring" />
-
- <TextView
- android:id="@+id/about_copyright"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center_horizontal"
- android:text="@string/about_copyright" />
-
- <TextView
- android:id="@+id/about_link"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:autoLink="web"
- android:linksClickable="true"
- android:text="www.libreoffice.org"
- tools:ignore="HardcodedText" />
-
- <TextView
- android:id="@+id/about_licence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center_horizontal"
- android:text="@string/about_licence" />
-
- <TextView
- android:id="@+id/about_libraries"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:text="@string/about_libraries" />
- </LinearLayout>
- </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/dialog_addserver.xml b/android/sdremote/res/layout/dialog_addserver.xml
deleted file mode 100644
index 475aabd..0000000
--- a/android/sdremote/res/layout/dialog_addserver.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/addserver_root"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="12dp"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/wifiAlertMsg"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="5dp"
- android:text="@string/wifiAlertMsg"
- android:textStyle="italic"
- android:typeface="serif" />
-
- <TextView
- android:id="@+id/addserver_namelabel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/addserver_entername" />
-
- <EditText
- android:id="@+id/addserver_nameentry"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:inputType="textCapWords" >
-
- <requestFocus />
- </EditText>
-
- <TextView
- android:id="@+id/addserver_addressabel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/addserver_enteraddress" />
-
- <EditText
- android:id="@+id/addserver_addressentry"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:inputType="textUri" >
-
- </EditText>
-
- <CheckBox
- android:id="@+id/addserver_remember"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:checked="true"
- android:text="@string/addserver_remember" />
-
-</LinearLayout>
diff --git a/android/sdremote/res/layout/fragment_blankscreen.xml b/android/sdremote/res/layout/fragment_blankscreen.xml
deleted file mode 100644
index 87ecf03..0000000
--- a/android/sdremote/res/layout/fragment_blankscreen.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_margin="10dip"
- android:gravity="center_vertical"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/blankscreen_blankimage"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:scaleType="fitXY"
- android:src="@drawable/rectangle_black" />
-
- <ImageView
- android:id="@+id/blankscreen_divider"
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:layout_below="@+id/blankscreen_blankimage"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="10dip"
- android:src="@color/medium_grey" />
-
- <ImageView
- android:id="@+id/blankscreen_slidepreview"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@id/blankscreen_divider"
- android:layout_toLeftOf="@+id/blankscreen_return"
- android:src="@drawable/rectangle_black" />
-
- <TextView
- android:id="@+id/blankscreen_return"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:gravity="center"
- android:layout_below="@id/blankscreen_divider"
- android:text="@string/blankscreen_return"
- android:layout_margin="5dip" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/fragment_presentation.xml b/android/sdremote/res/layout/fragment_presentation.xml
deleted file mode 100644
index 03c4ee7..0000000
--- a/android/sdremote/res/layout/fragment_presentation.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/presentation_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <pl.polidea.coverflow.CoverFlow
- xmlns:coverflow="http://schemas.android.com/apk/res/org.libreoffice.impressremote"
- android:id="@+id/presentation_coverflow"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dip"
- coverflow:imageHeight="150dip"
- coverflow:imageWidth="180dip"
- coverflow:withReflection="false" />
-
- <TextView
- android:id="@+id/presentation_slidenumber"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:text="" />
-
- <ImageView
- android:id="@+id/presentation_handle"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="6dp"
- android:contentDescription="@string/presentation_ui_resizehandle"
- android:paddingBottom="5dp"
- android:paddingTop="5dp"
- android:scaleType="fitXY"
- android:src="@drawable/handle" />
-
- <ScrollView
- android:id="@+id/presentation_scrollview"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <WebView
- android:id="@+id/presentation_notes"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/fragment_thumbnail.xml b/android/sdremote/res/layout/fragment_thumbnail.xml
deleted file mode 100644
index ecd8855..0000000
--- a/android/sdremote/res/layout/fragment_thumbnail.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/thumbnail_grid"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:columnWidth="90dp"
- android:gravity="center"
- android:horizontalSpacing="10dp"
- android:numColumns="auto_fit"
- android:paddingTop="10dp"
- android:stretchMode="columnWidth"
- android:verticalSpacing="10dp" >
-
-</GridView>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/main.xml b/android/sdremote/res/layout/main.xml
deleted file mode 100644
index b100941..0000000
--- a/android/sdremote/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
-<TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Hello World, Launcher"
- />
-</LinearLayout>
-
diff --git a/android/sdremote/res/layout/presentation_actionbar.xml b/android/sdremote/res/layout/presentation_actionbar.xml
deleted file mode 100644
index 1fd3bae9..0000000
--- a/android/sdremote/res/layout/presentation_actionbar.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal" >
-
- <ToggleButton
- android:id="@+id/actionbar_thumbnailtoggle"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:background="@drawable/actionbar_thumbs"
- android:textOff=""
- android:textOn="" />
-
- <ToggleButton
- android:id="@+id/actionbar_time"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:background="@drawable/actionbar_toggle"
- android:gravity="center"
- android:textColor="#FFFFFF"
- android:textSize="22dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/presentation_clockbar.xml b/android/sdremote/res/layout/presentation_clockbar.xml
deleted file mode 100644
index 98b913c..0000000
--- a/android/sdremote/res/layout/presentation_clockbar.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/clockbars_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <LinearLayout
- android:id="@+id/clockbar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#EE313131"
- android:orientation="horizontal" >
-
- <ToggleButton
- android:id="@+id/clockbar_toggle_clockmode"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:background="@drawable/clockbar_clock"
- android:textOff=""
- android:textOn="" />
-
- <ToggleButton
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list