[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml
|5 +
android/sdremote/Makefile
| 23 +---
android/sdremote/build.xml
| 11 +++-
android/sdremote/project.properties
|4 +
android/sdremote/res/layout/action_bar_computer_creation.xml
|8 +-
android/sdremote/res/menu/menu_action_bar_computer_connection.xml
|5 +
android/sdremote/res/menu/menu_action_bar_computers.xml
| 11 ++--
android/sdremote/res/menu/menu_action_bar_slide_show.xml
| 15 ++---
android/sdremote/res/values/styles.xml
|4 -
android/sdremote/res/values/themes.xml
| 27 --
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
|6 +-
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
|6 +-
android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
| 12 ++--
android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java
|6 +-
android/sdremote/src/org/libreoffice/impressremote/activity/RequirementsActivity.java
|6 +-
android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
| 12 +---
android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
| 12 ++--
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
| 12 ++--
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
|8 +-
android/sdremote/src/org/libreoffice/impressremote/fragment/EmptySlideFragment.java
|4 -
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
|4 -
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
|4 -
android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
|4 -
android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
|4 -
24 files changed, 112 insertions(+), 101 deletions(-)
New commits:
commit 233a15e3aaa1728d6782edb5385ff1061456a700
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Fri Dec 13 13:11:58 2013 +0100
move from ActionBarSherlock to corresponding android support lib
UI wise would makes the app compatible with android api level 7,
but other utility functions require higher level (8 for Base64 and 9 for
TimeUnit)
explicitly set the allowBackup flag and raise tested/targeted version to
api level 17
also add tool-annotations to please android-lint
Change-Id: I528e34acdeeecea6d20e8bea21b1d5c203e17c95
diff --git a/android/sdremote/AndroidManifest.xml
b/android/sdremote/AndroidManifest.xml
index 80c4ed6..c592b6f 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -34,10 +34,11 @@
android:required=false/
uses-sdk
-android:minSdkVersion=10
-android:targetSdkVersion=14/
+android:minSdkVersion=9
+android:targetSdkVersion=17/
application
+android:allowBackup=true
android:label=@string/application_name
android:icon=@drawable/ic_launcher
android:logo=@drawable/ic_logo
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index b46df56..84a7b80 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -6,22 +6,27 @@
# 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/.
-ifeq ($(BUILDDIR),)
+ifeq ($(WORKDIR),)
include ../../config_host.mk
endif
-all: properties
- mkdir -p ../abs-lib/libs
- cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar
../abs-lib/libs
+all: ant.properties
$(ANT) debug
-properties:
- echo sdk.dir=$(ANDROID_SDK_HOME) local.properties
- echo sdk.dir=$(ANDROID_SDK_HOME) ../abs-lib/local.properties
-
-clean: properties
+clean: ant.properties
$(ANT) -quiet -keep-going clean
+# library references must be relative, let python do the magic.
+ant.properties: $(WORKDIR)/appcompat/build.xml
+ python -c import os.path; print 'android.library.reference.1='+
os.path.relpath('$(D)', '$(CURDIR)') $@ || rm $@
+
+# sdk-manager installs it without an build.xml, to not mess with files outside
of the
+# build-tree, copy to workdir
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
|5 -
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
|1
android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
| 12 +-
android/sdremote/src/org/libreoffice/impressremote/util/BluetoothOperator.java
| 46 --
4 files changed, 7 insertions(+), 57 deletions(-)
New commits:
commit 4d6244cc80f1a384d571af2efd539bd3fa3f9291
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Sun Dec 15 16:44:12 2013 +0100
remove BluetoothOperator wrapper
it is just another obfuscating layer of one-command-function calles that
can as well be called directly.
If you really want to get the path to aquire the bluetooth adapter
differently, based on a runtime check, a single method to retrieve the
adapter is enough in any of the classes. No need to wrap the whole
adapter's api in your own class.
Change-Id: I2c631321dcf8ef143fe58a0a8246e010169409ac
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
index 1056b7d..d58460a 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
@@ -14,11 +14,10 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.UUID;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothSocket;
-import org.libreoffice.impressremote.util.BluetoothOperator;
-
class BluetoothServerConnection implements ServerConnection {
// Standard UUID for the Serial Port Profile.
//
https://www.bluetooth.org/en-us/specification/assigned-numbers-overview/service-discovery
@@ -32,7 +31,7 @@ class BluetoothServerConnection implements ServerConnection {
private BluetoothSocket buildServerConnection(Server aServer) {
try {
-BluetoothDevice aBluetoothServer = BluetoothOperator.getAdapter()
+BluetoothDevice aBluetoothServer =
BluetoothAdapter.getDefaultAdapter()
.getRemoteDevice(aServer.getAddress());
return aBluetoothServer.createRfcommSocketToServiceRecord(
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index a8aa85f..cea50e5 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -16,7 +16,6 @@ import android.os.Binder;
import android.os.IBinder;
import android.support.v4.content.LocalBroadcastManager;
-import org.libreoffice.impressremote.util.BluetoothOperator;
import org.libreoffice.impressremote.util.Intents;
public class CommunicationService extends Service implements Runnable,
MessagesListener, Timer.TimerListener {
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
index f5f4fe4..53d85d8 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java
@@ -8,13 +8,15 @@
*/
package org.libreoffice.impressremote.communication;
+import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.os.Build;
-import org.libreoffice.impressremote.util.BluetoothOperator;
import org.libreoffice.impressremote.util.Preferences;
final class PairingProvider {
+private static final BluetoothAdapter btAdapter =
BluetoothAdapter.getDefaultAdapter();
+
private final Preferences mAuthorizedServersPreferences;
private PairingProvider(Context aContext) {
@@ -58,15 +60,11 @@ final class PairingProvider {
}
private String getPairingDeviceName() {
-if (!BluetoothOperator.isAvailable()) {
-return Build.MODEL;
-}
-
-if (BluetoothOperator.getAdapter().getName() == null) {
+if (btAdapter == null || btAdapter.getName() == null) {
return Build.MODEL;
}
-return BluetoothOperator.getAdapter().getName();
+return btAdapter.getName();
}
}
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/util/BluetoothOperator.java
b/android/sdremote/src/org/libreoffice/impressremote/util/BluetoothOperator.java
deleted file mode 100644
index 9522838..000
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/drawable-hdpi/ic_action_bluetooth_searching.png |binary android/sdremote/res/drawable-mdpi/ic_action_bluetooth_searching.png |binary android/sdremote/res/drawable-xhdpi/ic_action_bluetooth_searching.png |binary android/sdremote/res/drawable-xxhdpi/ic_action_bluetooth_searching.png |binary android/sdremote/res/layout/progress.xml |5 android/sdremote/res/menu/menu_action_bar_computers.xml |5 android/sdremote/res/values/strings.xml |1 android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java |8 + android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java | 62 +++--- android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java | 17 ++ android/sdremote/src/org/libreoffice/impressremote/util/Intents.java |1 11 files changed, 57 insertions(+), 42 deletions(-) New commits: commit f5d14e0234effd16a570ec3f32349f53c1b469f0 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Sun Dec 15 17:19:24 2013 +0100 only autostart discovery when there are no known devices and don't loop autodiscovery, provide a manual trigger button instead. Bluetooth discovery is a hefty process and thus should not be done lightheartedly. Moreover discovery won't even list devices that are already bonded, but not set to visible. As you will be more likely using the remote with the same devices, it makes sense to list the known devices and only do discovery on explicit request/when there are no bonded devices yet. Fix a lifecycle problem (as the service would be quit on screen-rotation as the only bound client is destroyed/restarted - start the service instead to let it keep running, and only stop/release it when finishing) icons from Android's ActionBar Icon Pack, shrinked using optipng Change-Id: Ie8467f942df1aab2d64b337fc7a6f816b9d658a6 Reviewed-on: https://gerrit.libreoffice.org/7091 Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com Tested-by: Andrzej Hunt andrzej.h...@collabora.com diff --git a/android/sdremote/res/drawable-hdpi/ic_action_bluetooth_searching.png b/android/sdremote/res/drawable-hdpi/ic_action_bluetooth_searching.png new file mode 100644 index 000..0203ea4 Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/ic_action_bluetooth_searching.png differ diff --git a/android/sdremote/res/drawable-mdpi/ic_action_bluetooth_searching.png b/android/sdremote/res/drawable-mdpi/ic_action_bluetooth_searching.png new file mode 100644 index 000..22dccb1 Binary files /dev/null and b/android/sdremote/res/drawable-mdpi/ic_action_bluetooth_searching.png differ diff --git a/android/sdremote/res/drawable-xhdpi/ic_action_bluetooth_searching.png b/android/sdremote/res/drawable-xhdpi/ic_action_bluetooth_searching.png new file mode 100644 index 000..97252d4 Binary files /dev/null and b/android/sdremote/res/drawable-xhdpi/ic_action_bluetooth_searching.png differ diff --git a/android/sdremote/res/drawable-xxhdpi/ic_action_bluetooth_searching.png b/android/sdremote/res/drawable-xxhdpi/ic_action_bluetooth_searching.png new file mode 100644 index 000..8e827e9 Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_action_bluetooth_searching.png differ diff --git a/android/sdremote/res/layout/progress.xml b/android/sdremote/res/layout/progress.xml new file mode 100644 index 000..f768ec4 --- /dev/null +++ b/android/sdremote/res/layout/progress.xml @@ -0,0 +1,5 @@ +?xml version=1.0 encoding=utf-8? +ProgressBar xmlns:android=http://schemas.android.com/apk/res/android; +android:layout_width=match_parent +android:layout_height=match_parent +/ProgressBar diff --git a/android/sdremote/res/menu/menu_action_bar_computers.xml b/android/sdremote/res/menu/menu_action_bar_computers.xml index 7cbffc6..27ddf8a 100644 --- a/android/sdremote/res/menu/menu_action_bar_computers.xml +++ b/android/sdremote/res/menu/menu_action_bar_computers.xml @@ -24,6 +24,11 @@ android:title=@string/menu_add_computer android:icon=@drawable/ic_action_add_computer compat:showAsAction=always/ +item +android:id=@+id/menu_start_discovery +android:title=@string/menu_start_discovery +android:icon=@drawable/ic_action_bluetooth_searching +compat:showAsAction=always/ item android:id=@+id/menu_settings diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index 4ec816a..deca93b 100644 --- a/android/sdremote/res/values/strings.xml +++
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/layout-land/fragment_slides_pager.xml |9 - 1 file changed, 4 insertions(+), 5 deletions(-) New commits: commit 4bddd280f204f1036f9933a4b683a0b20a7d85a0 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Dec 30 01:23:49 2013 +0100 tweak paddings in landcape mode (maximize space for preview notes) add minimal padding around slide preview (to not touch actionbar and bottom of screen - horizontal whitespace will be larger becasue height is limiting factor anyway) avoid adding two left-paddings for the notes - the Text is indented compared to the notes area already, so margin implied by the layout weight distribution and the text indent is enough to separate it from the preview. avoid adding two right paddings for the note-text, as the text is not justified and the word-break itself will account for a padding at the edge, and the container already has a right-padding (that was reduced, since the word-padding as well as centering in the unused space will increase the effective margin) Change-Id: I2a4605ba5a98eeed93a01db16d3d86c90df56470 Reviewed-on: https://gerrit.libreoffice.org/7230 Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com Tested-by: Andrzej Hunt andrzej.h...@collabora.com diff --git a/android/sdremote/res/layout-land/fragment_slides_pager.xml b/android/sdremote/res/layout-land/fragment_slides_pager.xml index 340a462..e3e3c9b 100644 --- a/android/sdremote/res/layout-land/fragment_slides_pager.xml +++ b/android/sdremote/res/layout-land/fragment_slides_pager.xml @@ -25,14 +25,14 @@ android.support.v4.view.ViewPager android:id=@+id/pager_slides android:layout_weight=2 +android:padding=@dimen/padding_slide android:layout_width=0dp android:layout_height=match_parent/ LinearLayout android:id=@+id/layout_notes android:orientation=vertical -android:paddingLeft=@dimen/padding_slides_pager -android:paddingRight=@dimen/padding_slides_pager +android:paddingRight=@dimen/padding_slide_notes android:layout_weight=1 android:layout_width=0dp android:layout_height=match_parent @@ -45,6 +45,8 @@ ScrollView android:id=@+id/scroll_notes +android:paddingTop=@dimen/padding_slide_notes +android:paddingLeft=@dimen/padding_slide_notes android:layout_width=wrap_content android:layout_height=wrap_content @@ -53,9 +55,6 @@ android:inAnimation=@android:anim/fade_in android:outAnimation=@android:anim/fade_out android:measureAllChildren=false -android:paddingTop=@dimen/padding_slide_notes -android:paddingLeft=@dimen/padding_slide_notes -android:paddingRight=@dimen/padding_slide_notes android:layout_width=match_parent android:layout_height=wrap_content ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
| 164 +++---
android/sdremote/src/org/libreoffice/impressremote/adapter/ComputersPagerAdapter.java
| 29 -
2 files changed, 69 insertions(+), 124 deletions(-)
New commits:
commit 78b0b970fd72b19c9d49325bec566eb6e92935e5
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Sun Dec 15 17:33:22 2013 +0100
Use only one layout, with a dynamically sized PagerAdapter
it is more straightforward to only have one viewpager that can be
flipped through. This makes it easier to restore the user's default way
of connecting (bluetooth via wifi) and also simplifies the setup and
the what-tab-am-I-on checks.
* Remeber what tab (wifi/bluetooth) the user last used and restore that
on next launch
* respect Android's guidelines and ask the user whether Bluetooth should
be enabled when the user switches to the BT tab and BT is disabled.
â if the user declines, select wifi tab instead
Fix a lifecycle problem (bt connection would be cut if bt was not
enabled before launching the remote, only restore disbled state if
really finishing, not on configuration change like rotating the screen)
Change-Id: Ice3a5c877a2a4810a80a0f76edea713700fe9c8c
Reviewed-on: https://gerrit.libreoffice.org/7090
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
Tested-by: Andrzej Hunt andrzej.h...@collabora.com
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
index 0c7bd68..9329cd9 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -8,36 +8,40 @@
*/
package org.libreoffice.impressremote.activity;
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBar.Tab;
import android.support.v7.app.ActionBarActivity;
import android.view.Menu;
import android.view.MenuItem;
import org.libreoffice.impressremote.adapter.ComputersPagerAdapter;
-import org.libreoffice.impressremote.fragment.ComputersFragment;
-import org.libreoffice.impressremote.util.BluetoothOperator;
-import org.libreoffice.impressremote.util.Fragments;
+import org.libreoffice.impressremote.fragment.ComputersFragment.Type;
import org.libreoffice.impressremote.util.Intents;
import org.libreoffice.impressremote.R;
-import org.libreoffice.impressremote.util.Preferences;
-import org.libreoffice.impressremote.util.SavedStates;
public class ComputersActivity extends ActionBarActivity implements
ActionBar.TabListener, ViewPager.OnPageChangeListener {
-private boolean mBluetoothWasEnabled;
+private static final int REQUEST_ENABLE_BT = 0;
+private static final String SELECT_BLUETOOTH = SELECT_BLUETOOTH;
+private static final BluetoothAdapter btAdapter =
BluetoothAdapter.getDefaultAdapter();
+private static boolean disableBTOnQuit = btAdapter != null
!btAdapter.isEnabled();
+private static Tab btTab;
+private static Tab wifiTab;
+private boolean isInitializing;
+private ComputersPagerAdapter computersPagerAdapter = new
ComputersPagerAdapter(getSupportFragmentManager());
@Override
protected void onCreate(Bundle aSavedInstanceState) {
super.onCreate(aSavedInstanceState);
+isInitializing = true;
-saveBluetoothState(aSavedInstanceState);
-BluetoothOperator.enable();
-
+setContentView(R.layout.activity_computers);
// Looks hacky but it seems to be the best way to set activityâs
title
// different to applicationâs label. The other way is setting title
// to intents filter but it shows wrong label for recent apps screen
then.
@@ -47,72 +51,48 @@ public class ComputersActivity extends ActionBarActivity
implements ActionBar.Ta
aActionBar.setTitle(R.string.title_computers);
aActionBar.setDisplayShowTitleEnabled(true);
-if (BluetoothOperator.isAvailable()) {
-setUpComputersLists();
-}
-else {
-Fragment aComputersFragment =
ComputersFragment.newInstance(ComputersFragment.Type.WIFI);
-Fragments.Operator.add(this, aComputersFragment);
-}
-}
-
-private void saveBluetoothState(Bundle aSavedInstanceState) {
-// In more ideal world this work should be done at the service.
-// Unfortunately service cannot save or
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
| 11 --
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
| 51 ++
2 files changed, 37 insertions(+), 25 deletions(-)
New commits:
commit 7e08428ceb523896dbeb4afa4502e7197437231e
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Tue Dec 17 01:18:07 2013 +0100
add support for double-tap to go back a transition
by replacing the onClickListener with an onTouchListener with the simple
variant of the GestureDetector.
Also drop the check that prevents going to the end-of-presentation,
click to exit slide and exiting the presentation that way.
Change-Id: I54b49bf11929ad9415b8c85581fe16998ab3a7a7
Reviewed-on: https://gerrit.libreoffice.org/7107
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
Tested-by: Andrzej Hunt andrzej.h...@collabora.com
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
index 94304fb..da78264 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
@@ -25,15 +25,15 @@ public class SlidesPagerAdapter extends PagerAdapter {
private final SlideShow mSlideShow;
-private final View.OnClickListener mSlideClickListener;
+private final View.OnTouchListener mSlideTouchListener;
-public SlidesPagerAdapter(Context aContext, SlideShow aSlideShow,
View.OnClickListener aSlideClickListener) {
+public SlidesPagerAdapter(Context aContext, SlideShow aSlideShow,
View.OnTouchListener aSlideTouchListener) {
mLayoutInflater = LayoutInflater.from(aContext);
mImageLoader = new ImageLoader(aContext.getResources(),
R.drawable.bg_slide_unknown);
mSlideShow = aSlideShow;
-mSlideClickListener = aSlideClickListener;
+mSlideTouchListener = aSlideTouchListener;
}
@Override
@@ -52,9 +52,8 @@ public class SlidesPagerAdapter extends PagerAdapter {
setUpUnknownSlidePreview(aSlideView);
}
-// ViewPager itself cannot handle click events,
-// so we need to use hacks. Android is good.
-aSlideView.setOnClickListener(mSlideClickListener);
+// touch listener that handles tap and double-tap
+aSlideView.setOnTouchListener(mSlideTouchListener);
aViewGroup.addView(aSlideView);
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
index 3d13a11..002484a 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
@@ -18,11 +18,14 @@ import android.os.Bundle;
import android.os.IBinder;
import android.support.v4.app.Fragment;
import android.support.v4.content.LocalBroadcastManager;
+import android.support.v4.view.GestureDetectorCompat;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.text.Html;
import android.text.TextUtils;
+import android.view.GestureDetector;
import android.view.LayoutInflater;
+import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ScrollView;
@@ -34,9 +37,10 @@ import org.libreoffice.impressremote.R;
import org.libreoffice.impressremote.adapter.SlidesPagerAdapter;
import org.libreoffice.impressremote.communication.CommunicationService;
-public class SlidesPagerFragment extends Fragment implements
ServiceConnection, ViewPager.OnPageChangeListener, View.OnClickListener {
+public class SlidesPagerFragment extends Fragment implements
ServiceConnection, ViewPager.OnPageChangeListener, View.OnTouchListener {
private CommunicationService mCommunicationService;
private BroadcastReceiver mIntentsReceiver;
+private GestureDetectorCompat mDetector;
public static SlidesPagerFragment newInstance() {
return new SlidesPagerFragment();
@@ -44,6 +48,7 @@ public class SlidesPagerFragment extends Fragment implements
ServiceConnection,
@Override
public View onCreateView(LayoutInflater aInflater, ViewGroup aContainer,
Bundle aSavedInstanceState) {
+mDetector = new GestureDetectorCompat(aContainer.getContext(), new
MyGestureListener());
return aInflater.inflate(R.layout.fragment_slides_pager, aContainer,
false);
}
@@ -96,24 +101,6 @@ public class SlidesPagerFragment extends Fragment
implements ServiceConnection,
return new SlidesPagerAdapter(getActivity(), aSlideShow, this);
}
-@Override
-public void onClick(View aView) {
-
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/.gitignore |3 android/sdremote/res/layout-land/fragment_slides_pager.xml|9 - android/sdremote/res/layout-xlarge-land/fragment_slides_pager.xml | 75 ++ android/sdremote/res/layout/fragment_slides_pager.xml |9 - android/sdremote/res/values-xlarge/dimens.xml |6 android/sdremote/res/values/dimens.xml|2 6 files changed, 98 insertions(+), 6 deletions(-) New commits: commit a689b673b723a72a37bcb9f5ef5db5102b85bb41 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Mon Jan 13 13:49:54 2014 + Add tablet specific landscape layout. The resolution of the slide preview is too low for a maximised preview to be of much use, hence it makes sense to make the notes larger when in landscape mode on a tablet. Also increase the notes size for tablets (either perspective) in order to be legible from a greater distance. Change-Id: Iae75dead6bb325970f2309f487a5c198d938fcb4 Reviewed-on: https://gerrit.libreoffice.org/7102 Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com diff --git a/android/sdremote/res/.gitignore b/android/sdremote/res/.gitignore index 95f7438..b1effe5 100644 --- a/android/sdremote/res/.gitignore +++ b/android/sdremote/res/.gitignore @@ -1,2 +1,5 @@ +# Ignore values-* folders as to avoid inadvertently adding any translations +# (which end up in values-[langcode] directories). /values-* !/values-v10 +!/values-xlarge diff --git a/android/sdremote/res/layout-land/fragment_slides_pager.xml b/android/sdremote/res/layout-land/fragment_slides_pager.xml index 22f6000..340a462 100644 --- a/android/sdremote/res/layout-land/fragment_slides_pager.xml +++ b/android/sdremote/res/layout-land/fragment_slides_pager.xml @@ -40,7 +40,8 @@ TextView style=@style/SectionHeader android:text=@string/header_notes -android:paddingTop=@dimen/padding_header/ +android:paddingTop=@dimen/padding_header +android:textSize=@dimen/text_size_notes/ ScrollView android:id=@+id/scroll_notes @@ -60,11 +61,13 @@ TextView android:layout_width=match_parent -android:layout_height=wrap_content/ +android:layout_height=wrap_content +android:textSize=@dimen/text_size_notes/ TextView android:layout_width=match_parent -android:layout_height=wrap_content/ +android:layout_height=wrap_content +android:textSize=@dimen/text_size_notes/ /TextSwitcher diff --git a/android/sdremote/res/layout-xlarge-land/fragment_slides_pager.xml b/android/sdremote/res/layout-xlarge-land/fragment_slides_pager.xml new file mode 100644 index 000..ffd97c4 --- /dev/null +++ b/android/sdremote/res/layout-xlarge-land/fragment_slides_pager.xml @@ -0,0 +1,75 @@ +?xml version=1.0 encoding=utf-8? +!-- + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +-- +LinearLayout xmlns:android=http://schemas.android.com/apk/res/android; +android:layout_width=match_parent +android:layout_height=match_parent +android:gravity=center +android:orientation=horizontal + +android.support.v4.view.ViewPager +android:id=@+id/pager_slides +android:layout_width=0dp +android:layout_height=match_parent +android:layout_weight=1 / + +LinearLayout +android:id=@+id/layout_notes +android:layout_width=0dp +android:layout_height=match_parent +android:layout_weight=1 +android:orientation=vertical +android:paddingLeft=@dimen/padding_slides_pager +android:paddingRight=@dimen/padding_slides_pager + +TextView +style=@style/SectionHeader +android:paddingTop=@dimen/padding_header +android:text=@string/header_notes +android:textSize=@dimen/text_size_notes/ + +ScrollView +
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/layout-land/fragment_slides_pager.xml | 65 +++-- 1 file changed, 57 insertions(+), 8 deletions(-) New commits: commit 0d0b4a911c2ded7cc2cd64664a1994d0824482db Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Dec 2 00:48:08 2013 +0100 sdremote: show notes also in landscape orientation since why should portrait and landscape behave differently? Change-Id: I06ca350bc14ca0f9163d58927636d70a9630f3f9 diff --git a/android/sdremote/res/layout-land/fragment_slides_pager.xml b/android/sdremote/res/layout-land/fragment_slides_pager.xml index ea70c82..22f6000 100644 --- a/android/sdremote/res/layout-land/fragment_slides_pager.xml +++ b/android/sdremote/res/layout-land/fragment_slides_pager.xml @@ -16,11 +16,60 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- -android.support.v4.view.ViewPager -xmlns:android=http://schemas.android.com/apk/res/android; -android:id=@+id/pager_slides -android:layout_gravity=center -android:paddingTop=@dimen/padding_slides_pager -android:paddingBottom=@dimen/padding_slides_pager -android:layout_width=wrap_content -android:layout_height=wrap_content/ \ No newline at end of file +LinearLayout xmlns:android=http://schemas.android.com/apk/res/android; + android:orientation=horizontal + android:gravity=center + android:layout_width=match_parent + android:layout_height=match_parent + +android.support.v4.view.ViewPager +android:id=@+id/pager_slides +android:layout_weight=2 +android:layout_width=0dp +android:layout_height=match_parent/ + +LinearLayout +android:id=@+id/layout_notes +android:orientation=vertical +android:paddingLeft=@dimen/padding_slides_pager +android:paddingRight=@dimen/padding_slides_pager +android:layout_weight=1 +android:layout_width=0dp +android:layout_height=match_parent + +TextView +style=@style/SectionHeader +android:text=@string/header_notes +android:paddingTop=@dimen/padding_header/ + +ScrollView +android:id=@+id/scroll_notes +android:layout_width=wrap_content +android:layout_height=wrap_content + +TextSwitcher +android:id=@+id/text_switcher_notes +android:inAnimation=@android:anim/fade_in +android:outAnimation=@android:anim/fade_out +android:measureAllChildren=false +android:paddingTop=@dimen/padding_slide_notes +android:paddingLeft=@dimen/padding_slide_notes +android:paddingRight=@dimen/padding_slide_notes +android:layout_width=match_parent +android:layout_height=wrap_content + +TextView +android:layout_width=match_parent +android:layout_height=wrap_content/ + +TextView +android:layout_width=match_parent +android:layout_height=wrap_content/ + +/TextSwitcher + +/ScrollView + +/LinearLayout + +/LinearLayout ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/layout/action_bar_computer_creation.xml |
4 -
android/sdremote/res/layout/activity_requirements.xml |
6 -
android/sdremote/res/layout/fragment_slides_pager.xml |
2
android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java |
34 --
4 files changed, 6 insertions(+), 40 deletions(-)
New commits:
commit 4f8a7cc2f38a9748f566c9255ce94cb5e6a284fa
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Mon Dec 2 22:56:42 2013 +0100
get rid of custom all-caps ui widget
as there is a corresponding property available since Api Level 14 that
is already used in the corresponding stlye definition.
Not a problem if older versions of android ignore that and don't show
the string in caps.
Change-Id: Ia9d5e32242bfc83370524011d11854f2c08348ba
diff --git a/android/sdremote/res/layout/action_bar_computer_creation.xml
b/android/sdremote/res/layout/action_bar_computer_creation.xml
index 2e31abb..1a0dcd3 100644
--- a/android/sdremote/res/layout/action_bar_computer_creation.xml
+++ b/android/sdremote/res/layout/action_bar_computer_creation.xml
@@ -28,7 +28,7 @@
android:layout_width=0dp
android:layout_height=match_parent
-org.libreoffice.impressremote.view.CapsTextView
+TextView
style=@style/Widget.Sherlock.ActionBar.TabText
android:text=@string/button_cancel
android:drawableLeft=@drawable/ic_action_cancel
@@ -55,7 +55,7 @@
android:layout_width=0dp
android:layout_height=match_parent
-org.libreoffice.impressremote.view.CapsTextView
+TextView
style=@style/Widget.Sherlock.ActionBar.TabText
android:text=@string/button_save
android:drawableLeft=@drawable/ic_action_save
diff --git a/android/sdremote/res/layout/activity_requirements.xml
b/android/sdremote/res/layout/activity_requirements.xml
index adee272..2cf839d 100644
--- a/android/sdremote/res/layout/activity_requirements.xml
+++ b/android/sdremote/res/layout/activity_requirements.xml
@@ -26,7 +26,7 @@
android:layout_width=match_parent
android:layout_height=wrap_content
-org.libreoffice.impressremote.view.CapsTextView
+TextView
style=@style/SectionHeader
android:text=@string/title_generic/
@@ -38,7 +38,7 @@
style=@style/SectionItem
android:text=@string/requirements_libreoffice_general_enabled/
-org.libreoffice.impressremote.view.CapsTextView
+TextView
style=@style/SectionHeader
android:text=@string/title_wifi/
@@ -54,7 +54,7 @@
style=@style/SectionItem
android:text=@string/requirements_network_ports/
-org.libreoffice.impressremote.view.CapsTextView
+TextView
style=@style/SectionHeader
android:text=@string/title_bluetooth/
diff --git a/android/sdremote/res/layout/fragment_slides_pager.xml
b/android/sdremote/res/layout/fragment_slides_pager.xml
index 97c5c72..3a9ebb6 100644
--- a/android/sdremote/res/layout/fragment_slides_pager.xml
+++ b/android/sdremote/res/layout/fragment_slides_pager.xml
@@ -39,7 +39,7 @@
android:layout_width=match_parent
android:layout_height=0dp
-org.libreoffice.impressremote.view.CapsTextView
+TextView
style=@style/SectionHeader
android:text=@string/header_notes
android:paddingTop=@dimen/padding_header/
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java
b/android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java
deleted file mode 100644
index 84b632f..000
--- a/android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-package org.libreoffice.impressremote.view;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-public class CapsTextView extends TextView {
-public CapsTextView(Context aContext) {
-super(aContext);
-}
-
-public CapsTextView(Context aContext, AttributeSet aAttributeSet) {
-super(aContext, aAttributeSet);
-}
-
-public CapsTextView(Context aContext, AttributeSet aAttributeSet, int
aDefinedStyle) {
-super(aContext, aAttributeSet, aDefinedStyle);
-}
-
-@Override
-public void setText(CharSequence aText, BufferType aBufferType) {
-super.setText(aText.toString().toUpperCase(), aBufferType);
-
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/values/strings.xml
|1
android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
| 14 +-
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
| 12 +
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
| 22 +-
android/sdremote/src/org/libreoffice/impressremote/util/BluetoothOperator.java
| 10 +++-
android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
|5 ++
6 files changed, 50 insertions(+), 14 deletions(-)
New commits:
commit 3cc31f89787e435c893b38a0adc0a23f566ab60f
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Dec 10 19:52:33 2013 +
fdo#60486 Fix auto-enabling bluetooth and improve bluetooth handling.
We should only enable bluetooth with explicit approval of the user, see:
http://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#enable%28%29
We now also display an appropriate message if bluetooth is disabled.
Change-Id: Ic3a07c9ad0806a60ac7c7e609a30add7af18916f
diff --git a/android/sdremote/res/values/strings.xml
b/android/sdremote/res/values/strings.xml
index 4ec816a..7dc068a 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -90,5 +90,6 @@
string name=requirements_network_connectionThe Android device and a
computer connected to the same network./string
string name=requirements_network_portsIf you have a firewall make sure
ports 1598 and 1599 are opened./string
string name=requirements_bluetooth_connectionA computer with enabled
Bluetooth./string
+string name=message_bluetooth_disabledPlease enable bluetooth to
connect to a bluetooth enabled computer./string
/resources
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
index 043965a..7d1336c 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -31,6 +31,8 @@ import org.libreoffice.impressremote.util.SavedStates;
public class ComputersActivity extends SherlockFragmentActivity implements
ActionBar.TabListener, ViewPager.OnPageChangeListener {
private boolean mBluetoothWasEnabled;
+private final static int REQUEST_ENABLE_BT = 1;
+
@Override
protected void onCreate(Bundle aSavedInstanceState) {
super.onCreate(aSavedInstanceState);
@@ -42,6 +44,16 @@ public class ComputersActivity extends
SherlockFragmentActivity implements Actio
setUpContent();
}
+@Override
+protected void onActivityResult(int arg0, int arg1, Intent arg2) {
+super.onActivityResult(arg0, arg1, arg2);
+
+if (arg0 == REQUEST_ENABLE_BT) {
+// Ideally we should do all detection based on listening to the
bluetooth state
+// as the user can still enable BT separately (see
BluetoothServersFinder.java:onReceive)
+}
+}
+
private void saveBluetoothState(Bundle aSavedInstanceState) {
// In more ideal world this work should be done at the service.
// Unfortunately service cannot save or restore its state.
@@ -64,7 +76,7 @@ public class ComputersActivity extends
SherlockFragmentActivity implements Actio
}
private void enableBluetooth() {
-BluetoothOperator.enable();
+BluetoothOperator.enable(this, REQUEST_ENABLE_BT);
}
private void setUpTitle() {
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
index 29e9b9c..e696a1b 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
@@ -72,9 +72,19 @@ class BluetoothServersFinder extends BroadcastReceiver
implements ServersFinder,
public void onReceive(Context aContext, Intent aIntent) {
if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(aIntent.getAction()))
{
switch (aIntent.getIntExtra(BluetoothAdapter.EXTRA_STATE, 0)) {
-case BluetoothAdapter.STATE_ON:
+case BluetoothAdapter.STATE_ON: {
BluetoothOperator.getAdapter().startDiscovery();
+Intent aNewIntent =
Intents.buildBluetoothStateChangedIntent();
+
LocalBroadcastManager.getInstance(mContext).sendBroadcast(aNewIntent);
return;
+}
+
+case BluetoothAdapter.STATE_OFF:
[Libreoffice-commits] core.git: android/sdremote l10ntools/Executable_stringex.mk l10ntools/inc l10ntools/Module_l10ntools.mk l10ntools/source Repository.mk solenv/gbuild
Repository.mk |1
android/sdremote/Makefile | 42 --
l10ntools/Executable_stringex.mk | 36 -
l10ntools/Module_l10ntools.mk |1
l10ntools/inc/stringmerge.hxx | 41 --
l10ntools/source/localize.cxx |2
l10ntools/source/stringex.cxx | 42 --
l10ntools/source/stringmerge.cxx | 193 -
solenv/gbuild/extensions/pre_BuildTools.mk |1
9 files changed, 2 insertions(+), 357 deletions(-)
New commits:
commit 4c530d3d18727567d3c5ec3721dc46866b34d2e0
Author: Andras Timar andras.ti...@collabora.com
Date: Sun Nov 17 10:58:20 2013 +0100
good-bye stringex, you served well
It will be better to handle Android Impress Remote localization
independent of the big LibreOffice source tree. Instead of
stringex, we will use android2po, a 3rd party utility for conversion
strings.xml - pot/po.
Change-Id: I4eae53e4f8d94c55e5564d54c5e5c214bc9569d7
diff --git a/Repository.mk b/Repository.mk
index ac07ba1..eca28ce 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
sp2bv \
svg2odf \
svidl \
- stringex \
transex3 \
treex \
uiex \
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index c480bcc..b46df56 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -10,11 +10,7 @@ ifeq ($(BUILDDIR),)
include ../../config_host.mk
endif
-STRINGEX_EXECUTABLE := $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/stringex
-STRINGEX_LDPATH :=
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)
-STRINGEX_COMMAND := $(STRINGEX_LDPATH) $(STRINGEX_EXECUTABLE)
-
-all: properties translations.done
+all: properties
mkdir -p ../abs-lib/libs
cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar
../abs-lib/libs
$(ANT) debug
@@ -23,44 +19,10 @@ properties:
echo sdk.dir=$(ANDROID_SDK_HOME) local.properties
echo sdk.dir=$(ANDROID_SDK_HOME) ../abs-lib/local.properties
-clean: properties translations.clean
+clean: properties
$(ANT) -quiet -keep-going clean
install: all
$(ANDROID_SDK_HOME)/platform-tools/adb install -r
./bin/ImpressRemote-debug.apk
-define android_get_podir
-res/values-$(1)
-endef
-
-define android_get_po
-$(call android_get_podir,$(1))/strings.xml
-endef
-
-define android_translation_rules
-$(call android_get_po,$(1)):
- mkdir -p res/values-$(1)
- echo $(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po
translations-$(1).db \
- $(STRINGEX_COMMAND) -i res/values/strings.xml -o
res/values-$(1)/strings.xml -m translations-$(1).db -l $(1)
-
-endef
-
-define android_translations_rules
-$(foreach lang,$(1),$(call android_translation_rules,$(lang)))
-endef
-
-define android_get_langlist
-$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo nso kok
qtz,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
-endef
-
-$(eval $(call android_translations_rules,$(call android_get_langlist)))
-
-translations.done: $(foreach lang,$(call android_get_langlist),$(call
android_get_po,$(lang)))
- touch translations.done
-
-translations.clean:
- rm -rf $(foreach lang,$(call android_get_langlist),$(call
android_get_podir,$(lang)))
- rm -rf $(foreach lang,$(call
android_get_langlist),translations-$(lang).db)
- rm -f translations.done
-
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_stringex.mk b/l10ntools/Executable_stringex.mk
deleted file mode 100644
index 4f9edfd..000
--- a/l10ntools/Executable_stringex.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-
-$(eval $(call gb_Executable_Executable,stringex))
-
-$(eval $(call gb_Executable_set_include,stringex,\
--I$(SRCDIR)/l10ntools/inc \
-$$(INCLUDE) \
-))
-
-$(eval $(call gb_Executable_use_libraries,stringex,\
-sal \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,stringex,\
-transex \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,stringex,\
-l10ntools/source/stringmerge \
-l10ntools/source/stringex \
-))
-
-$(eval $(call gb_Executable_use_externals,stringex,\
-boost_headers \
-libxml2 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index 9797252..d391ed7 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -21,7 +21,6 @@ $(eval $(call
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/xml/preferences.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit 740381502470e5d0e11e5db0a82f27a7d14f4d01 Author: Artur Dryomov artur.dryo...@gmail.com Date: Fri Sep 20 23:22:11 2013 +0300 Add setting default values for settings items. Users still will be able to disable them if they wish. Change-Id: If20f628c0c1f36e4a2b5c4619d7e843e91f19040 diff --git a/android/sdremote/res/xml/preferences.xml b/android/sdremote/res/xml/preferences.xml index 87b8450..104c528 100644 --- a/android/sdremote/res/xml/preferences.xml +++ b/android/sdremote/res/xml/preferences.xml @@ -3,11 +3,13 @@ CheckBoxPreference android:key=volume_keys_actions +android:defaultValue=true android:title=@string/preferences_volume_keys_actions_title android:summary=@string/preferences_volume_keys_actions_summary/ CheckBoxPreference android:key=keep_screen_on +android:defaultValue=true android:title=@string/preferences_keep_screen_on_title android:summary=@string/preferences_keep_screen_on_summary/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
| 12 +-
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 4c30c48684cd09a057906f30d7a3f8927ecabb52
Author: Artur Dryomov artur.dryo...@gmail.com
Date: Tue Sep 3 15:53:03 2013 +0300
Move building server via TCP servers finder to a separate method.
Change-Id: I8def7a5f7ecf924f6cc61f3a037defa9e8116089
Reviewed-on: https://gerrit.libreoffice.org/5815
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
index b31e4f6..84f305b 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
@@ -124,11 +124,7 @@ class TcpServersFinder implements ServersFinder, Runnable {
String aFoundServerHostname = aSearchResultScanner.nextLine();
-Server aFoundServer = new Server(Server.Protocol.TCP,
-aSearchResultPacket.getAddress().getHostAddress(),
-aFoundServerHostname);
-
-addServer(aFoundServer);
+addServer(buildServer(aSearchResultPacket, aFoundServerHostname));
callUpdatingServersList();
}
@@ -156,6 +152,12 @@ class TcpServersFinder implements ServersFinder, Runnable {
mServers.put(aServer.getAddress(), aServer);
}
+private Server buildServer(DatagramPacket aSearchResultPacket, String
aServerHostname) {
+String aServerAddress =
aSearchResultPacket.getAddress().getHostAddress();
+
+return Server.newTcpInstance(aServerAddress, aServerHostname);
+}
+
private void callUpdatingServersList() {
Intent aIntent = Intents.buildServersListChangedIntent();
LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
|3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c37cd33fad388ad486d42f008f9908784611fe23
Author: Artur Dryomov artur.dryo...@gmail.com
Date: Thu Sep 5 20:21:00 2013 +0300
Add suppressing warnings for preferences activity.
Change-Id: I7808e8bbc080b65017dc273e423db51c9151d9f7
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
index 4309e8e..612b6c7 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java
@@ -27,9 +27,10 @@ public class SettingsActivity extends
SherlockPreferenceActivity {
getSupportActionBar().setHomeButtonEnabled(true);
}
+@SuppressWarnings(deprecation)
private void setUpPreferences() {
// This action is deprecated
-// but we still need to target pre-Honeycomb devices
+// but we still need to target pre-Honeycomb devices.
addPreferencesFromResource(R.xml.preferences);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
|1
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
|2 -
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
| 13 --
3 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 687b62f4812f88c9aef3bdd864358282850aa2ec
Author: Michael Meeks michael.me...@suse.com
Date: Thu Aug 1 15:35:41 2013 +0200
android: don't mess with the system bluetooth setting unless we have to.
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
index 6ecaabe..fe5834d 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
@@ -6,6 +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.communication;
import java.io.IOException;
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
index a236ac5..35be694 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
@@ -27,7 +27,7 @@ import org.libreoffice.impressremote.util.Intents;
import org.libreoffice.impressremote.communication.Server.Protocol;
class BluetoothServersFinder extends BroadcastReceiver implements
ServersFinder, Runnable {
-private static final int SEARCH_DELAY_IN_MILLISECONDS = 1000 * 10;
+private static final int SEARCH_DELAY_IN_MILLISECONDS = 1000 * 5;
private final Context mContext;
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index 6041190..8ded38f 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -37,6 +37,8 @@ public class CommunicationService extends Service implements
Runnable, MessagesL
private IBinder mBinder;
private ServersManager mServersManager;
+private static boolean gWasBluetoothEnabled = false;
+private static boolean gWasBluetoothEnabledFetched = false;
private ServerConnection mServerConnection;
@@ -162,7 +164,13 @@ public class CommunicationService extends Service
implements Runnable, MessagesL
mState = State.SEARCHING;
if (BluetoothAdapter.getDefaultAdapter() != null) {
-BluetoothAdapter.getDefaultAdapter().enable();
+if (!gWasBluetoothEnabledFetched) {
+gWasBluetoothEnabled =
BluetoothAdapter.getDefaultAdapter().isEnabled();
+gWasBluetoothEnabledFetched = true;
+
+if (!gWasBluetoothEnabled)
+BluetoothAdapter.getDefaultAdapter().enable();
+}
}
mServersManager.startServersSearch();
@@ -172,7 +180,8 @@ public class CommunicationService extends Service
implements Runnable, MessagesL
mServersManager.stopServersSearch();
if (BluetoothAdapter.getDefaultAdapter() != null) {
-BluetoothAdapter.getDefaultAdapter().disable();
+if (!gWasBluetoothEnabled)
+BluetoothAdapter.getDefaultAdapter().disable();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
| 45 --
1 file changed, 38 insertions(+), 7 deletions(-)
New commits:
commit 08157e4b63e41c1dbbc07584517fd4341cc5654c
Author: Artur Dryomov artur.dryo...@gmail.com
Date: Fri Aug 2 04:10:49 2013 +0300
Add saving state for ComputerConnectionFragment.
This change should provide more smooth rotation change.
Change-Id: I3d530485752069fb5f6d4683b68b83ef97f87808
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
index c70599e..05172b5 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
@@ -75,6 +75,27 @@ public class ComputerConnectionFragment extends
SherlockFragment implements Serv
}
@Override
+public void onViewStateRestored(Bundle aSavedInstanceState) {
+super.onViewStateRestored(aSavedInstanceState);
+
+if (aSavedInstanceState == null) {
+return;
+}
+
+loadLayout(aSavedInstanceState);
+}
+
+private void loadLayout(Bundle aSavedInstanceState) {
+int aLayoutIndex = aSavedInstanceState.getInt(LAYOUT);
+
+getViewAnimator().setDisplayedChild(aLayoutIndex);
+}
+
+private ViewAnimator getViewAnimator() {
+return (ViewAnimator) getView().findViewById(R.id.view_animator);
+}
+
+@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -89,7 +110,6 @@ public class ComputerConnectionFragment extends
SherlockFragment implements Serv
@Override
public void onServiceConnected(ComponentName aComponentName, IBinder
aBinder) {
CommunicationService.CBinder aServiceBinder =
(CommunicationService.CBinder) aBinder;
-
mCommunicationService = aServiceBinder.getService();
connectToComputer();
@@ -181,7 +201,7 @@ public class ComputerConnectionFragment extends
SherlockFragment implements Serv
}
private void showPinValidationLayout() {
-ViewAnimator aViewAnimator = (ViewAnimator)
getView().findViewById(R.id.view_animator);
+ViewAnimator aViewAnimator = getViewAnimator();
LinearLayout aValidationLayout = (LinearLayout)
getView().findViewById(R.id.layout_pin_validation);
aViewAnimator.setDisplayedChild(aViewAnimator.indexOfChild(aValidationLayout));
@@ -215,7 +235,7 @@ public class ComputerConnectionFragment extends
SherlockFragment implements Serv
}
private void showErrorMessageLayout() {
-ViewAnimator aViewAnimator = (ViewAnimator)
getView().findViewById(R.id.view_animator);
+ViewAnimator aViewAnimator = getViewAnimator();
LinearLayout aMessageLayout = (LinearLayout)
getView().findViewById(R.id.layout_error_message);
aViewAnimator.setDisplayedChild(aViewAnimator.indexOfChild(aMessageLayout));
@@ -240,9 +260,7 @@ public class ComputerConnectionFragment extends
SherlockFragment implements Serv
return false;
}
-ViewAnimator aViewAnimator = (ViewAnimator)
getView().findViewById(R.id.view_animator);
-
-return aViewAnimator.getCurrentView().getId() ==
R.id.layout_error_message;
+return getViewAnimator().getCurrentView().getId() ==
R.id.layout_error_message;
}
@Override
@@ -260,7 +278,7 @@ public class ComputerConnectionFragment extends
SherlockFragment implements Serv
}
private void showProgressBar() {
-ViewAnimator aViewAnimator = (ViewAnimator)
getView().findViewById(R.id.view_animator);
+ViewAnimator aViewAnimator = getViewAnimator();
ProgressBar aProgressBar = (ProgressBar)
getView().findViewById(R.id.progress_bar);
aViewAnimator.setDisplayedChild(aViewAnimator.indexOfChild(aProgressBar));
@@ -283,6 +301,19 @@ public class ComputerConnectionFragment extends
SherlockFragment implements Serv
}
@Override
+public void onSaveInstanceState(Bundle aOutState) {
+super.onSaveInstanceState(aOutState);
+
+saveLayout(aOutState);
+}
+
+private void saveLayout(Bundle aOutState) {
+int aLayoutIndex = getViewAnimator().getDisplayedChild();
+
+aOutState.putInt(LAYOUT, aLayoutIndex);
+}
+
+@Override
public void onDestroy() {
super.onDestroy();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote cui/uiconfig reportdesign/source svx/uiconfig
android/sdremote/res/values/strings.xml |4 ++--
cui/uiconfig/ui/colorpage.ui |2 +-
reportdesign/source/core/resource/strings.src |2 +-
svx/uiconfig/ui/redlineviewpage.ui|2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 23cafa4aca8ed197fbec8b5edac0fba4435db2cd
Author: Andras Timar ati...@suse.com
Date: Mon May 27 11:31:48 2013 +0200
fix typos reported by localizers
Change-Id: I0b9a36f0c6f081ff35f0b8bc6e420d881036576c
diff --git a/android/sdremote/res/values/strings.xml
b/android/sdremote/res/values/strings.xml
index 324d852..816deae 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -17,7 +17,7 @@
string name=clock_timer_resumeResume/string
string name=options_autodeclineDecline Calls/string
string name=helpHelp/string
-string name=ConnectionFailedHelp#1 Verify Impress is running \n#2 For
Bluetooth user, enable \Preference\-\LibreOffice
Impress\-\General\-\Enable remote control\\n#3 For WiFi user, tick
\Preferece\-\LibreOffice\-\Advanced\-\Enable Experimental Features\ \n
/string
+string name=ConnectionFailedHelp#1 Verify Impress is running \n#2 For
Bluetooth user, enable \Preferences\-\LibreOffice
Impress\-\General\-\Enable remote control\\n#3 For WiFi user, tick
\Preferences\-\LibreOffice\-\Advanced\-\Enable Experimental Features\
\n /string
string name=options_descriptionAutomatically decline all incoming
calls./string
string name=options_volumeswitchingVolume Switching/string
string name=options_volumeswitching_descriptonChange slides using
volume buttons/string
@@ -53,7 +53,7 @@
string name=addserver_cancelCancel/string
string name=reconnect_description1Your connection has been
dropped./string
string name=reconnect_description2Please try to reconnect/string
-string name=wifiAlertMsgThis is still an experimental feature. You
need to \enable experimental features\ in
\Preference\-\LibreOffice\-\Advanced\ on your computer. \nThe use over
Bluetooth is recommended./string
+string name=wifiAlertMsgThis is still an experimental feature. You
need to \enable experimental features\ in
\Preferences\-\LibreOffice\-\Advanced\ on your computer. \nThe use over
Bluetooth is recommended./string
string-array name=countdown_values
item 5:00/item
item 10:00/item
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index e190e4d..4a16e76 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -206,7 +206,7 @@
property name=id_column1/property
items
item translatable=yesRGB/item
- item translatable=yesCYMK/item
+ item translatable=yesCMYK/item
/items
child internal-child=accessible
object class=AtkObject id=modellb-atkobject
diff --git a/reportdesign/source/core/resource/strings.src
b/reportdesign/source/core/resource/strings.src
index d161f29..8ac0dd7 100644
--- a/reportdesign/source/core/resource/strings.src
+++ b/reportdesign/source/core/resource/strings.src
@@ -56,7 +56,7 @@ String RID_STR_REPORT_FOOTER
String RID_STR_PROPERTY_CHANGE_NOT_ALLOWED
{
-Text [ en-US ] = The name '#1' already exists and can not be asssigned
again.;
+Text [ en-US ] = The name '#1' already exists and cannot be assigned
again.;
};
String RID_STR_ERROR_WRONG_ARGUMENT
diff --git a/svx/uiconfig/ui/redlineviewpage.ui
b/svx/uiconfig/ui/redlineviewpage.ui
index d5e538e..2d817e9 100644
--- a/svx/uiconfig/ui/redlineviewpage.ui
+++ b/svx/uiconfig/ui/redlineviewpage.ui
@@ -30,7 +30,7 @@
object class=GtkLabel id=position
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=label translatable=yesPostion/property
+property name=label translatable=yesPosition/property
/object
packing
property name=expandFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote unixODBC/inc
android/sdremote/res/values/strings.xml |2 +- unixODBC/inc/odbc/sqltypes.h|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4d08f1a49d277cfd186bca2d39e7d586fd274038 Author: Andras Timar ati...@suse.com Date: Sat May 25 13:48:42 2013 +0200 typo: s/recommanded/recommended/ Change-Id: I4a22f856b993ef09556fcf921aa1f01be322cd4b diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index 3500aee..324d852 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -53,7 +53,7 @@ string name=addserver_cancelCancel/string string name=reconnect_description1Your connection has been dropped./string string name=reconnect_description2Please try to reconnect/string -string name=wifiAlertMsgThis is still an experimental feature. You need to \enable experimental features\ in \Preference\-\LibreOffice\-\Advanced\ on your computer. \nThe use over Bluetooth is recommanded./string +string name=wifiAlertMsgThis is still an experimental feature. You need to \enable experimental features\ in \Preference\-\LibreOffice\-\Advanced\ on your computer. \nThe use over Bluetooth is recommended./string string-array name=countdown_values item 5:00/item item 10:00/item diff --git a/unixODBC/inc/odbc/sqltypes.h b/unixODBC/inc/odbc/sqltypes.h index 1b0f9d5..8800502 100644 --- a/unixODBC/inc/odbc/sqltypes.h +++ b/unixODBC/inc/odbc/sqltypes.h @@ -84,7 +84,7 @@ typedef charCHAR; /* * NOTE: The Microsoft unicode define is only for apps that want to use TCHARs and * be able to compile for both unicode and non-unicode with the same source. - * This is not recommanded for linux applications and is not supported + * This is not recommended for linux applications and is not supported * by the standard linux string header files. */ #ifdef SQL_WCHART_CONVERT ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/Makefile|
2
android/sdremote/res/layout/presentation_clockbar.xml|
17 -
android/sdremote/res/values/strings.xml |
10
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
136 +-
4 files changed, 97 insertions(+), 68 deletions(-)
New commits:
commit b6ab91d55e1bfb487abba2b15589a1988178ee88
Author: Ota Chasák chasak@gmail.com
Date: Wed Apr 24 15:59:20 2013 +0100
fdo#60791 - fix android remote count-down / clock.
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 26acfd8..78b89eb 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -13,7 +13,7 @@ endif
all: properties translations.done
mkdir -p ../abs-lib/libs
cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar
../abs-lib/libs
- $(ANT) -quiet debug
+ $(ANT) debug
properties:
echo sdk.dir=$(ANDROID_SDK_HOME) local.properties
diff --git a/android/sdremote/res/layout/presentation_clockbar.xml
b/android/sdremote/res/layout/presentation_clockbar.xml
index 4d5d028..98b913c 100644
--- a/android/sdremote/res/layout/presentation_clockbar.xml
+++ b/android/sdremote/res/layout/presentation_clockbar.xml
@@ -73,15 +73,20 @@
android:background=#DD4D4D4D
android:orientation=horizontal
-EditText
-android:id=@+id/clockbar_countdown_time
+AutoCompleteTextView android:id=@+id/countdown_time
+android:layout_width=wrap_content
+ android:layout_height=match_parent
+ android:layout_weight=1
+ android:completionThreshold=1 /
+
+ Button
+android:id=@+id/clockbar_countdown_reset
android:layout_width=0dip
android:layout_height=match_parent
android:layout_weight=1
-android:ems=10
-android:inputType=time
-android:text=03:00
-/EditText
+android:background=#
+android:text=@string/clock_timer_reset
+android:textColor=#FF /
Button
android:id=@+id/clockbar_countdown_button
diff --git a/android/sdremote/res/values/strings.xml
b/android/sdremote/res/values/strings.xml
index 84edffc..3500aee 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -54,5 +54,13 @@
string name=reconnect_description1Your connection has been
dropped./string
string name=reconnect_description2Please try to reconnect/string
string name=wifiAlertMsgThis is still an experimental feature. You
need to \enable experimental features\ in
\Preference\-\LibreOffice\-\Advanced\ on your computer. \nThe use over
Bluetooth is recommanded./string
-
+string-array name=countdown_values
+item 5:00/item
+item 10:00/item
+item 15:00/item
+item 20:00/item
+item 30:00/item
+item 45:00/item
+/string-array
+string name=wrong_time_formatYou have entered wrong time
format/string
/resources
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 51e590f..ab081df 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -23,6 +23,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
@@ -37,10 +38,11 @@ import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
import android.widget.Button;
-import android.widget.EditText;
import android.widget.FrameLayout;
-import android.widget.TextView;
+import android.widget.Toast;
import android.widget.ToggleButton;
import com.actionbarsherlock.app.ActionBar;
@@ -205,8 +207,7 @@ public class PresentationActivity extends
SherlockFragmentActivity {
}
private class ActionBarManager implements OnClickListener,
-FragmentManager.OnBackStackChangedListener,
-TextView.OnEditorActionListener {
+FragmentManager.OnBackStackChangedListener {
private Handler timerHandler = new Handler();
@@ -226,8 +227,12 @@ public class PresentationActivity extends
SherlockFragmentActivity {
// --- COUNTDOWN BAR
private View mCountdownBar;
-private EditText mCountdownEntry;
private Button
[Libreoffice-commits] core.git: android/sdremote l10ntools/inc l10ntools/source librelogo/CustomTarget_librelogo.mk solenv/gbuild
android/sdremote/Makefile |8 ++-
l10ntools/inc/export.hxx|1
l10ntools/inc/helpmerge.hxx |6 +-
l10ntools/inc/po.hxx|1
l10ntools/source/common.cxx |2
l10ntools/source/helpex.cxx | 22 ++--
l10ntools/source/helpmerge.cxx | 83 +
l10ntools/source/merge.cxx | 33 +
l10ntools/source/po.cxx | 89
l10ntools/source/propmerge.cxx | 46 --
l10ntools/source/stringmerge.cxx| 56 +-
l10ntools/source/treemerge.cxx | 51
librelogo/CustomTarget_librelogo.mk | 27 +++---
solenv/gbuild/Dictionary.mk | 26 ++
solenv/gbuild/ExtensionTarget.mk| 88 ++-
solenv/gbuild/HelpTarget.mk | 54 ++---
16 files changed, 356 insertions(+), 237 deletions(-)
New commits:
commit 36b3bcefcf13996610239f95b1dce9f291bde95d
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sat Apr 20 09:20:31 2013 +0200
Some changes in qtz handling
Executalbes, which work one language, generat qtz by own.
(stringex,helpex,treex,propex)
So these executables can generate qtz without po file
when use them with qtz, call them with -m flag without parameter.
Change-Id: I56c34db7151dc3ef0ce1c85ed607719e4cbb5e92
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index b8ea1e9..26acfd8 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -36,8 +36,10 @@ endef
define android_translation_rules
$(call android_get_po,$(1)):
mkdir -p res/values-$(1)
- echo $(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po
translations-$(1).db
- $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o
res/values-$(1)/strings.xml -m translations-$(1).db -l $(1)
+ $(if $(filter-out qtz,$(1)), \
+ echo
$(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po
translations-$(1).db \
+ $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o
res/values-$(1)/strings.xml -m translations-$(1).db -l $(1), \
+ $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o
res/values-$(1)/strings.xml -m -l $(1))
endef
@@ -46,7 +48,7 @@ $(foreach lang,$(1),$(call android_translation_rules,$(lang)))
endef
define android_get_langlist
-$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo qtz nso
kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
+$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo nso
kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
endef
$(eval $(call android_translations_rules,$(call android_get_langlist)))
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 2230569..a1a2e8c 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -281,6 +281,7 @@ public:
bTitleFirst[ rId ] = true;
}
sal_Bool GetText( OString rReturn, sal_uInt16 nTyp, const OString
nLangIndex, sal_Bool bDel = sal_False );
+static OString GetQTZText(const ResData rResData, const OString
rOrigText);
};
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 1f9c90a..42b2401 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -49,12 +49,12 @@ public:
/// Method merges the String from the POfile into XMLfile. Both Strings must
/// point to existing files.
bool Merge( const OString rPOFile_in, const OString rDestinationFile_in ,
-const OString sLanguage , MergeDataFile aMergeDataFile );
+const OString sLanguage , MergeDataFile* pMergeDataFile );
private:
-bool MergeSingleFile( XMLFile* file , MergeDataFile aMergeDataFile ,
const OString sLanguage , OString const sPath );
+bool MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile ,
const OString sLanguage , OString const sPath );
-void ProcessHelp( LangHashMap* aLangHM , const OString sCur , ResData
*pResData , MergeDataFile aMergeDataFile );
+void ProcessHelp( LangHashMap* aLangHM , const OString sCur , ResData
*pResData , MergeDataFile* pMergeDataFile );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 26bbedf..603727d 100755
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -63,6 +63,7 @@ public:
OString getKeyId() const;
static bool IsInSameComp(const PoEntry rPo1,const PoEntry rPo2);
+static OString genKeyId(const OString rGenerator);
};
diff --git a/l10ntools/source/common.cxx b/l10ntools/source/common.cxx
index 304f44c..b143a7c 100644
--- a/l10ntools/source/common.cxx
+++ b/l10ntools/source/common.cxx
@@ -37,6 +37,7 @@ bool handleArguments(
else if ( OString( argv[ i ] ).toAsciiUpperCase() == -M )
{
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |5 android/sdremote/res/layout/activity_reconnect.xml | 12 - android/sdremote/res/layout/dialog_addserver.xml | 12 - android/sdremote/res/values/strings.xml |6 android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java | 53 android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java | 66 - android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java | 15 + android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java | 37 +-- android/sdremote/src/org/libreoffice/impressremote/communication/Client.java |7 android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java | 23 +- android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java | 111 +- android/sdremote/src/org/libreoffice/impressremote/communication/ReconnectionActivity.java | 81 +++ android/sdremote/src/org/libreoffice/impressremote/communication/Server.java | 35 +++ 13 files changed, 361 insertions(+), 102 deletions(-) New commits: commit 38cc47f8b1715525cf4a2ccaab7464e9ed1c734c Author: Siqi LIU (via Code Review) ger...@gerrit.libreoffice.org Date: Fri Apr 12 23:49:21 2013 + fdo#61873 - add WiFi experimental feature alert. fixes reconnect crash. Won't crash when server-end disconnect. seperate Client construction and initialization so that Client() will release its mutex lock and won't block service.run(). Otherwise onBackPressed() will be blocked in PairingActivity Change-Id: I424a470aa02b0c74b28cb9f9ba79489aa0d4ab1b diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index d279fbb..8eaf63d 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -57,6 +57,11 @@ android:icon=@drawable/icon_options android:label=@string/options /activity +activity +android:name=.communication.ReconnectionActivity +android:logo=@drawable/actionbar_icon_computer +android:label=@string/reconnect +/activity /application /manifest diff --git a/android/sdremote/res/layout/activity_reconnect.xml b/android/sdremote/res/layout/activity_reconnect.xml index 8baa76d..0d2f8bb 100644 --- a/android/sdremote/res/layout/activity_reconnect.xml +++ b/android/sdremote/res/layout/activity_reconnect.xml @@ -40,7 +40,17 @@ 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 \ No newline at end of file +/RelativeLayout diff --git a/android/sdremote/res/layout/dialog_addserver.xml b/android/sdremote/res/layout/dialog_addserver.xml index 01ddba2..475aabd 100644 --- a/android/sdremote/res/layout/dialog_addserver.xml +++ b/android/sdremote/res/layout/dialog_addserver.xml @@ -3,9 +3,19 @@ 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 @@ -43,4 +53,4 @@ android:checked=true android:text=@string/addserver_remember / -/LinearLayout \ No newline at end of file +/LinearLayout diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index a08edd1..84edffc 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -7,6 +7,7 @@ string name=presentation_ui_resizehandleHandle to resize view./string string name=presentation_blank_screenBlank Screen/string string name=optionsOptions/string +string
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4560c49c1e87c6c08d18734fef8d1420e048ad0e Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 27 12:40:10 2013 +0100 Bump android remote version to 1.0.6+, version code to 8 Change-Id: Id8585bbc7f44ef59a27271119bdb1df701b9692f diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index d1d53df..d279fbb 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote -android:versionCode=7 -android:versionName=1.0.5+ Impress Remote +android:versionCode=8 +android:versionName=1.0.6+ Impress Remote android:installLocation=auto uses-permission android:name=android.permission.INTERNET / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
| 23
android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
| 47 +-
2 files changed, 26 insertions(+), 44 deletions(-)
New commits:
commit 514d6c6fb61437a2e4f6c94abb4bfea22936f86c
Author: Artur Dryomov artur.dryo...@gmail.com
Date: Fri Mar 22 23:03:32 2013 +0300
fdo#62591 - change Impress remote slide previews building
* Store bitmaps directly instead of byte arrays.
* Store bitmaps with shadows instead of one set with shadows and another
without them.
This change should optimize memory usage a bit.
Change-Id: Ied7ce57a660438a06167e8984d16a6f26ebd8c23
Reviewed-on: https://gerrit.libreoffice.org/2917
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 0aab5a6..8f1ba7d 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -21,10 +21,7 @@ import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.content.res.Configuration;
import android.graphics.Bitmap;
-import android.graphics.Canvas;
import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.RectF;
import android.os.Bundle;
import android.os.IBinder;
import android.support.v4.content.LocalBroadcastManager;
@@ -38,7 +35,6 @@ import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ImageView;
import android.widget.TextView;
-
import com.actionbarsherlock.app.SherlockFragment;
public class PresentationFragment extends SherlockFragment {
@@ -306,24 +302,7 @@ public class PresentationFragment extends SherlockFragment
{
@Override
protected Bitmap createBitmap(int position) {
-Bitmap aBitmap = mSlideShow.getImage(position);
-final int borderWidth = 8;
-
-Paint p = new Paint(Paint.ANTI_ALIAS_FLAG);
-p.setShadowLayer(borderWidth, 0, 0, Color.BLACK);
-
-RectF aRect = new RectF(borderWidth, borderWidth, borderWidth
-+ aBitmap.getWidth(), borderWidth
-+ aBitmap.getHeight());
-Bitmap aOut = Bitmap.createBitmap(aBitmap.getWidth() + 2
-* borderWidth, aBitmap.getHeight() + 2
-* borderWidth, aBitmap.getConfig());
-Canvas canvas = new Canvas(aOut);
-canvas.drawColor(getResources().getColor(R.color.light_grey));
-canvas.drawRect(aRect, p);
-canvas.drawBitmap(aBitmap, null, aRect, null);
-
-return aOut;
+return mSlideShow.getImage(position);
}
}
}
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
index 3925fe2..8b7a8e1 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
@@ -9,17 +9,20 @@
package org.libreoffice.impressremote.communication;
import org.libreoffice.impressremote.R;
-import org.libreoffice.impressremote.Globals;
-import android.util.Log;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
import android.util.SparseArray;
+
public class SlideShow {
-private SparseArraybyte[] mPreviewImages = new SparseArraybyte[]();
+private SparseArrayBitmap mPreviews = new SparseArrayBitmap();
private SparseArrayString mNotes = new SparseArrayString();
private int mSize = 0;
@@ -47,28 +50,28 @@ public class SlideShow {
}
protected void putImage(int aSlide, byte[] aImage) {
-mPreviewImages.put(aSlide, aImage);
+Bitmap aBitmap = BitmapFactory.decodeByteArray(aImage, 0,
aImage.length);
+final int borderWidth = 8;
+
+Paint p = new Paint(Paint.ANTI_ALIAS_FLAG);
+p.setShadowLayer(borderWidth, 0, 0, Color.BLACK);
+
+RectF aRect = new RectF(borderWidth, borderWidth, borderWidth
++ aBitmap.getWidth(), borderWidth
++ aBitmap.getHeight());
+Bitmap aOut = Bitmap.createBitmap(aBitmap.getWidth() + 2
+* borderWidth, aBitmap.getHeight() + 2
+* borderWidth, aBitmap.getConfig());
+Canvas canvas = new Canvas(aOut);
+
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
|1
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
|6 -
android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
|1
android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java
|1
android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
| 11 --
android/sdremote/src/org/libreoffice/impressremote/communication/Client.java
|2 -
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
|2 -
android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
|6 ++---
android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
|2 -
android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
|2 -
10 files changed, 7 insertions(+), 27 deletions(-)
New commits:
commit 2d8547d095897037388b27075fd7dc182a4e4912
Author: Artur Dryomov artur.dryo...@gmail.com
Date: Fri Mar 22 22:13:30 2013 +0300
Clean up Impress remove client source code a bit.
* Remove unnecessary semicolons.
* Remove empty methods that only call super methods.
* Replace String concatenation with StringBuilder.
* Fix possible NullPointerException on String comparison.
* Remove TODO comments generated via IDE.
Change-Id: Id2d2ebd29386080715fd743f81fbfae3a4a0a5ce
Reviewed-on: https://gerrit.libreoffice.org/2915
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
index be82eeb..8f172e5 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
@@ -75,7 +75,6 @@ public class BlankScreenFragment extends SherlockFragment {
aListener);
v.findViewById(R.id.blankscreen_return).setOnClickListener(aListener);
mCommunicationService.getTransmitter().blankScreen();
-// TODO Auto-generated method stub
return v;
}
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index d3a0352..51e590f 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -529,12 +529,6 @@ public class PresentationActivity extends
SherlockFragmentActivity {
mActionBarManager.hidePopups();
return super.onInterceptTouchEvent(aEvent);
}
-
-@Override
-public boolean onTouchEvent(MotionEvent aEvent) {
-return super.onTouchEvent(aEvent);
-}
-
}
private BroadcastReceiver mListener = new BroadcastReceiver() {
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index 1b8c044..3b0f684 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
@@ -171,7 +171,6 @@ public class SelectorActivity extends SherlockActivity {
@Override
protected void onPause() {
-// TODO Auto-generated method stub
super.onPause();
if (mCommunicationService != null) {
mCommunicationService.stopSearching();
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java
index 56d5bad..471e96b 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java
@@ -18,7 +18,6 @@ public class SettingsActivity extends
SherlockPreferenceActivity {
// but build with sdk 15
@Override
protected void onCreate(Bundle savedInstanceState) {
-// TODO Auto-generated method stub
super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
addPreferencesFromResource(R.xml.preferences);
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
index d1f2487..c939973 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
+++
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 8559269f6a298f0fc0ca2be9c8bfdadba89db1f1 Author: Tor Lillqvist t...@iki.fi Date: Sat Mar 23 20:32:20 2013 +0200 Allow installation on external storage (SD card) Change-Id: Ied56bfe26ebf0082aab91ff823da732f26ab5702 diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index f8729c0..d1d53df 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -2,7 +2,8 @@ manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote android:versionCode=7 -android:versionName=1.0.5+ Impress Remote +android:versionName=1.0.5+ Impress Remote +android:installLocation=auto uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7ed6097396c6407840fc8b8a40b03f03e7573821 Author: Artur Dryomov artur.dryo...@gmail.com Date: Thu Mar 14 12:11:31 2013 +0300 Change Impress remote client target SDK version. This change should remove compatibility menu button for modern Android versions. See Android developers blog post for details: http://android-developers.blogspot.com/2012/01/say-goodbye-to-menu-button.html Change-Id: I9152fa06558eabd633ad0c19174f45ee2ee9 Reviewed-on: https://gerrit.libreoffice.org/2719 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 572c5abb9..f8729c0 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -10,7 +10,7 @@ uses-sdk android:minSdkVersion=10 -android:targetSdkVersion=10 / +android:targetSdkVersion=14 / application android:icon=@drawable/ic_launcher ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java |
10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 04ab54f0c74ef0edcdd3ede3a5046a02f4bc90b1
Author: Artur Dryomov artur.dryo...@gmail.com
Date: Thu Mar 14 14:25:55 2013 +0300
fdo#60604 - fix Impress remote client speaker notes encoding
There is nothing wrong with the current code, it is the Androidâs
problem.
Issue was reported upstream:
https://code.google.com/p/android/issues/detail?id=1733#c23
Tested on Jelly Bean 4.2 and russian speaker notes.
Change-Id: I85414abac233186484078637073b97562b81aad2
Reviewed-on: https://gerrit.libreoffice.org/2723
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 60e16a3..0aab5a6 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -100,7 +100,7 @@ public class PresentationFragment extends SherlockFragment {
mNotes = (WebView) v.findViewById(R.id.presentation_notes);
String summary = htmlbodyThis is just a testbr/ulliAnd
item/liliAnd again/li/ulMore
textbr/Blablabr/Blablabr/blablabr/Blabla/body/html;
-mNotes.loadData(summary, text/html, UTF-8);
+mNotes.loadDataWithBaseURL(null, summary, text/html, UTF-8, null);
mNotes.setBackgroundColor(Color.TRANSPARENT);
mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow);
@@ -156,8 +156,8 @@ public class PresentationFragment extends SherlockFragment {
//int aSlide =
mCommunicationService.getSlideShow().getCurrentSlide();
mNumberText.setText((aPosition + 1) + /
+ mCommunicationService.getSlideShow().getSize());
-mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html, UTF-8);
+mNotes.loadDataWithBaseURL(null, mCommunicationService.getSlideShow()
+.getNotes(aPosition), text/html, UTF-8, null);
}
// -- RESIZING LISTENER
@@ -281,8 +281,8 @@ public class PresentationFragment extends SherlockFragment {
CommunicationService.MSG_SLIDE_NOTES)) {
int aPosition = aIntent.getExtras().getInt(slide_number);
if ( aPosition == mTopView.getSelectedItemPosition() ) {
-mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html,
UTF-8);
+mNotes.loadDataWithBaseURL(null,
mCommunicationService.getSlideShow()
+.getNotes(aPosition), text/html,
UTF-8, null);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit fad56362e61f6e0b5fe966d940e86779139d663e Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 12 14:54:32 2013 +0100 Bump android remote version to 1.0.5+, version code to 7 Change-Id: I65977c732a8f7e66898dd98964f8974c0f7e diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 359313e..572c5abb9 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote -android:versionCode=6 -android:versionName=1.0.4+ Impress Remote +android:versionCode=7 +android:versionName=1.0.5+ Impress Remote uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/layout/activity_presentation.xml |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit b2a11dc9a1b7890d77314d0101004289088e6054 Author: OndÅej Smrž bio...@centrum.cz Date: Sun Mar 10 13:10:37 2013 +0100 fdo#61421 Added line to prevent screenlocking during presentation Added line to xml layout to prevent locking screen during using this layout Change-Id: Ia2f71e67a3d09bacf1cb7e95dd05a2008129eb24 Reviewed-on: https://gerrit.libreoffice.org/2640 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/android/sdremote/res/layout/activity_presentation.xml b/android/sdremote/res/layout/activity_presentation.xml index 23b615a..1dbf5a6 100644 --- a/android/sdremote/res/layout/activity_presentation.xml +++ b/android/sdremote/res/layout/activity_presentation.xml @@ -2,7 +2,8 @@ xmlns:tools=http://schemas.android.com/tools; android:id=@+id/framelayout android:layout_width=match_parent -android:layout_height=match_parent +android:layout_height=match_parent +android:keepScreenOn = true view android:id=@+id/presentation_interceptor ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java |
6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b5e6c7d278abd618ce79a7e0a37bda176bd65619
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 11 10:28:51 2013 +
fdo#60604 - tag notes text as UTF-8.
Change-Id: I535cdae8c742e5b260d73bd000f9354cfe04b854
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index bb24d40a7..60e16a3 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -100,7 +100,7 @@ public class PresentationFragment extends SherlockFragment {
mNotes = (WebView) v.findViewById(R.id.presentation_notes);
String summary = htmlbodyThis is just a testbr/ulliAnd
item/liliAnd again/li/ulMore
textbr/Blablabr/Blablabr/blablabr/Blabla/body/html;
-mNotes.loadData(summary, text/html, null);
+mNotes.loadData(summary, text/html, UTF-8);
mNotes.setBackgroundColor(Color.TRANSPARENT);
mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow);
@@ -157,7 +157,7 @@ public class PresentationFragment extends SherlockFragment {
mNumberText.setText((aPosition + 1) + /
+ mCommunicationService.getSlideShow().getSize());
mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html, null);
+.getNotes(aPosition), text/html, UTF-8);
}
// -- RESIZING LISTENER
@@ -282,7 +282,7 @@ public class PresentationFragment extends SherlockFragment {
int aPosition = aIntent.getExtras().getInt(slide_number);
if ( aPosition == mTopView.getSelectedItemPosition() ) {
mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html, null);
+.getNotes(aPosition), text/html,
UTF-8);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f179f84821c17025410cbbf047406dbb49a568d7 Author: Petr Mladek pmla...@suse.cz Date: Wed Feb 27 20:07:11 2013 +0100 Bump android remote version to 1.0.4+, version code to 6 Change-Id: I7af423bab5885570c3651199e313ed4414c8461e diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 7302b44..359313e 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote -android:versionCode=5 -android:versionName=1.0.3+ Impress Remote +android:versionCode=6 +android:versionName=1.0.4+ Impress Remote uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/drawable-hdpi/ic_launcher.png |binary android/sdremote/res/drawable-ldpi/ic_launcher.png |binary android/sdremote/res/drawable-mdpi/ic_launcher.png |binary android/sdremote/res/drawable-xhdpi/ic_launcher.png |binary android/sdremote/res/drawable/libreoffice_logo.9.png |binary 5 files changed New commits: commit 5baf32af4c18fd443c41fdf05ab0c8c110fd438e Author: Thorsten Behrens tbehr...@suse.com Date: Tue Feb 26 16:38:03 2013 +0100 Update android remote artwork. Remote icon artwork from Issa Alkurtass ialkurt...@kacst.edu.sa, info box banner from Maxim Darak. Change-Id: I4a7ddd51b47dba109a75a60ad184cbbc4e2cef8f diff --git a/android/sdremote/res/drawable-hdpi/ic_launcher.png b/android/sdremote/res/drawable-hdpi/ic_launcher.png index 160d264..c1c8f58 100644 Binary files a/android/sdremote/res/drawable-hdpi/ic_launcher.png and b/android/sdremote/res/drawable-hdpi/ic_launcher.png differ diff --git a/android/sdremote/res/drawable-ldpi/ic_launcher.png b/android/sdremote/res/drawable-ldpi/ic_launcher.png index d216f31..9657a3c 100644 Binary files a/android/sdremote/res/drawable-ldpi/ic_launcher.png and b/android/sdremote/res/drawable-ldpi/ic_launcher.png differ diff --git a/android/sdremote/res/drawable-mdpi/ic_launcher.png b/android/sdremote/res/drawable-mdpi/ic_launcher.png index 5029b3c..f2440d4 100644 Binary files a/android/sdremote/res/drawable-mdpi/ic_launcher.png and b/android/sdremote/res/drawable-mdpi/ic_launcher.png differ diff --git a/android/sdremote/res/drawable-xhdpi/ic_launcher.png b/android/sdremote/res/drawable-xhdpi/ic_launcher.png index e9d1353..4a575a6 100644 Binary files a/android/sdremote/res/drawable-xhdpi/ic_launcher.png and b/android/sdremote/res/drawable-xhdpi/ic_launcher.png differ diff --git a/android/sdremote/res/drawable/libreoffice_logo.9.png b/android/sdremote/res/drawable/libreoffice_logo.9.png index 1b239b7..11bb5f2 100644 Binary files a/android/sdremote/res/drawable/libreoffice_logo.9.png and b/android/sdremote/res/drawable/libreoffice_logo.9.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
| 11 +-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit bcaa4cd4f3be07f9211b51da4d258b61423f1e28
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 19 16:26:52 2013 +
sdremote: debugging to get a better handle on failed image allocations.
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
index 2135dbf..3925fe2 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
@@ -9,7 +9,9 @@
package org.libreoffice.impressremote.communication;
import org.libreoffice.impressremote.R;
+import org.libreoffice.impressremote.Globals;
+import android.util.Log;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -54,7 +56,14 @@ public class SlideShow {
return BitmapFactory.decodeResource(mContext.getResources(),
R.drawable.image_loading);
}
-Bitmap aBitmap = BitmapFactory.decodeByteArray(aImage, 0,
aImage.length);
+Bitmap aBitmap = null;
+try {
+aBitmap = BitmapFactory.decodeByteArray(aImage, 0, aImage.length);
+} catch (OutOfMemoryError e) {
+Log.e(Globals.TAG, Bitmap decoding error byte length: +
aImage.length +
+ first 4 bytes: + aImage[0] + + aImage[1] + +
aImage[2] + + aImage[3] +
+ Exception + e);
+}
if (aBitmap == null) {
return BitmapFactory.decodeResource(mContext.getResources(),
R.drawable.image_loading);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bbfc250a9480caf32564cfc5913048d46cbfab1f Author: Petr Mladek pmla...@suse.cz Date: Tue Feb 19 21:03:48 2013 +0100 Bump android remote version to 1.0.3+, version code to 5 Change-Id: Id6ce687c7925f6d9ebca446be16b5ae237ca97f8 diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 2eca7d7..7302b44 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote -android:versionCode=4 -android:versionName=1.0.2+ Impress Remote +android:versionCode=5 +android:versionName=1.0.3+ Impress Remote uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote l10ntools/source
android/sdremote/Makefile|2 ++
l10ntools/source/stringmerge.cxx |5 +++--
l10ntools/source/treemerge.cxx |4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 5fd7c66733620ffaf06172cb9998bd73b7a2f9ba
Author: Thorsten Behrens tbehr...@suse.com
Date: Sun Feb 17 14:14:02 2013 +0100
Fix fdo#60754 - no translations for langs sorting after qtz
Adjust check to not rely on lexicographical order. This amends
8ae3ddca7e99d2bdbaadd5e0c82de2f0fbd30f91.
Change-Id: I5023b07af819eb09ea9dc569bdbac806f936485f
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 3972a06..9d9712a 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -54,5 +54,7 @@ translations.done: $(foreach lang,$(call
android_get_langlist),$(call android_ge
translations.clean:
rm -rf $(foreach lang,$(call android_get_langlist),$(call
android_get_podir,$(lang)))
+ rm -rf $(foreach lang,$(call
android_get_langlist),translations-$(lang).db)
+ rm translations.done
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 378548e..133a5bf 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -132,13 +132,14 @@ void StringParser::Merge(
MergeDataFile aMergeDataFile(
rMergeSrc, static_castOString( m_pSource-name ), false );
const std::vectorOString vLanguages = aMergeDataFile.GetLanguages();
-if( vLanguages.size()=2 vLanguages[0] != m_sLang )
+if( vLanguages.size()=2
+vLanguages[vLanguages[0]==qtz ? 1 : 0] != m_sLang )
{
std::cerr
stringex error: given language conflicts with
language of Mergedata file:
m_sLang.getStr() -
- vLanguages[vLanguages[0]==qtz ? 0 : 1].getStr() std::endl;
+ vLanguages[vLanguages[0]==qtz ? 1 : 0].getStr() std::endl;
return;
}
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index 8f022de..6529a10 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -283,13 +283,13 @@ void TreeParser::Merge(
rMergeSrc, static_castOString( m_pSource-name ), false, false );
const std::vectorOString vLanguages = aMergeDataFile.GetLanguages();
if( vLanguages.size()=2
-vLanguages[vLanguages[0]==qtz ? 0 : 1] != m_sLang )
+vLanguages[vLanguages[0]==qtz ? 1 : 0] != m_sLang )
{
std::cerr
Treex error: given language conflicts with
language of Mergedata file:
m_sLang.getStr() -
- vLanguages[vLanguages[0]==qtz ? 0 : 1].getStr()
std::endl;
+ vLanguages[vLanguages[0]==qtz ? 1 : 0].getStr()
std::endl;
return;
}
lcl_MergeLevel(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 03b941e9ae63626a3336aabdb6a3485835ec6f9d
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 13 13:51:08 2013 +
sdremote: avoid crash when fiddling with elapsed time.
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 0de6b32..d3a0352 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -485,7 +485,7 @@ public class PresentationActivity extends
SherlockFragmentActivity {
@Override
public boolean onEditorAction(TextView tv, int aID, KeyEvent aEvent) {
-if (aEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+if (aEvent != null aEvent.getKeyCode() ==
KeyEvent.KEYCODE_ENTER) {
long aTime = 0;
try {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
|6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 5d5bed66db9ad7f875aa968f5309304aa95eb936
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 12 13:36:04 2013 +0200
Tell what 1101--1000-8000-00805F9B34FB is
Fun that we have to reverse engineer and document magic numbers in our own
code. Code written less than a year ago.
Change-Id: I02b7697e7e02b85c8df78acda8f943c9b0628359
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
index a4fd1ef..b395169 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
@@ -42,6 +42,10 @@ public class BluetoothClient extends Client {
BluetoothDevice aDevice = mAdapter
.getRemoteDevice(aServer.getAddress());
mAdapter.cancelDiscovery();
+// This is the standard UUID for the Serial Port Profile.
+// I.e. the 16-bit SerialPort UUID 0x1101 inserted into the
+// Bluetooth BASE_UUID. See
+//
https://www.bluetooth.org/Technical/AssignedNumbers/service_discovery.htm
mSocket = aDevice.createRfcommSocketToServiceRecord(UUID
.fromString(1101--1000-8000-00805F9B34FB));
mSocket.connect();
@@ -84,4 +88,4 @@ public class BluetoothClient extends Client {
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
| 58 +++---
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
|5
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
| 10 +
3 files changed, 34 insertions(+), 39 deletions(-)
New commits:
commit 5e037cef389162fc75e3048a33d9175bf9e0bee5
Author: Tor Lillqvist t...@iki.fi
Date: Wed Feb 13 00:34:49 2013 +0200
Simplify and fix management of the server lists
The existing code in refreshLists() was somewhat hard to understand, and it
actually crashed (if uncommented-out). Now it simply empties the maps and
view
lists and then rebuilds them.
The visible end result, at least for me, is that I no longer get duplicate
servers in the list...
Change-Id: I1543292e219e666e7dcbc68473f40a11e2eb3381
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index ac6012b..207aef7 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
@@ -9,8 +9,8 @@
package org.libreoffice.impressremote;
import java.text.MessageFormat;
-import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map.Entry;
import org.libreoffice.impressremote.communication.CommunicationService;
@@ -267,27 +267,18 @@ public class SelectorActivity extends SherlockActivity {
private void refreshLists() {
if (mCommunicationService != null) {
-Server[] aServers = mCommunicationService.getServers();
+ListServer aServers = mCommunicationService.getServers();
+
+Log.i(Globals.TAG, SelectorActivity.refreshLists: got +
aServers.size() + servers);
+
+// Simply replace the lists... first clear the old lists,
+// Then add those currently found.
+
+mNetworkServers.clear();
+mBluetoothServers.clear();
+mNetworkList.removeAllViews();
+mBluetoothList.removeAllViews();
-/* TODO: this crashes currently - some concurrent modification on
mBluetoothServers
-// Bluetooth -- Remove old
-for (EntryServer, View aEntry : mBluetoothServers.entrySet()) {
-if (!Arrays.asList(aServers).contains(aEntry.getKey())) {
-mBluetoothServers.remove(aEntry.getKey());
-mBluetoothList.removeView((View) aEntry.getValue()
-.getParent());
-}
-}
-*/
-// Network -- Remove old
-for (EntryServer, View aEntry : mNetworkServers.entrySet()) {
-if (!Arrays.asList(aServers).contains(aEntry.getKey())) {
-mNetworkServers.remove(aEntry.getKey());
-mNetworkList.removeView((View) aEntry.getValue()
-.getParent());
-}
-}
-// Add all new
for (Server aServer : aServers) {
boolean aIsBluetooth = (aServer.getProtocol() ==
Protocol.BLUETOOTH);
HashMapServer, View aMap = aIsBluetooth ? mBluetoothServers
@@ -295,22 +286,19 @@ public class SelectorActivity extends SherlockActivity {
LinearLayout aLayout = aIsBluetooth ? mBluetoothList
: mNetworkList;
-if (!aMap.containsKey(aServer)) {
-View aView = getLayoutInflater()
-
.inflate(R.layout.activity_selector_sublayout_server,
-null);
+View aView = getLayoutInflater()
+
.inflate(R.layout.activity_selector_sublayout_server,
+null);
-TextView aText = (TextView) aView
-.findViewById(R.id.selector_sub_label);
-aText.setOnClickListener(mClickListener);
-aText.setText(aServer.getName());
-aLayout.addView(aView);
-aMap.put(aServer, aText);
-
-//registerForContextMenu(aView);
-registerForContextMenu(aText);
-}
+TextView aText = (TextView) aView
+.findViewById(R.id.selector_sub_label);
+aText.setOnClickListener(mClickListener);
+aText.setText(aServer.getName());
+aLayout.addView(aView);
+aMap.put(aServer, aText);
+//registerForContextMenu(aView);
+registerForContextMenu(aText);
}
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
|2 ++
1 file changed, 2 insertions(+)
New commits:
commit b48bde463a849f6d441159949fdb409fbe75aca7
Author: Tor Lillqvist t...@iki.fi
Date: Wed Feb 13 08:43:49 2013 +0200
Don't bother with unnamed computers
Change-Id: I4e912cab7ab252ef4c118fe63b02931eecd986aa
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
index b9c2cab..972a8a4 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
@@ -77,6 +77,8 @@ public class BluetoothFinder {
BluetoothDevice aDevice = (BluetoothDevice) aIntent.getExtras()
.get(BluetoothDevice.EXTRA_DEVICE);
Log.i(Globals.TAG, BluetoothFinder.onReceive: found +
aDevice.getName() + at + aDevice.getAddress());
+if (aDevice.getName() == null)
+return;
Server aServer = new Server(Protocol.BLUETOOTH,
aDevice.getAddress(), aDevice.getName(),
System.currentTimeMillis());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/values/strings.xml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 056968fae7fa598e8cb528fb6b45c999de33a102
Author: Tor Lillqvist t...@iki.fi
Date: Wed Feb 13 09:17:53 2013 +0200
Use consistent terminology
Why Choose a Computer but Add Server? Let's always call them computers
in the UI.
And in fact I think the feature to add a computer manually is kinda
pointless;
is it too much to ask people to have their machines discoverable? I doubt
keeping a computer not discoverable through Bluetooth thwarts a determined
attacker from finding it anyway. (I am not saying that just finding it would
mean compromising it.)
Change-Id: Ib8041a8a793d84bee24587adac582c5fad03d1be
diff --git a/android/sdremote/res/values/strings.xml
b/android/sdremote/res/values/strings.xml
index e84b7fa..80493f9 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -25,7 +25,7 @@
string name=bluetoothBluetooth/string
string name=wifiWI-FI/string
string name=selector_noserversSearching for computersâ¦/string
-string name=selector_deleteRemove server/string
+string name=selector_deleteRemove computer/string
string name=selector_choose_a_computerChoose a Computer/string
string name=selector_dialog_connectingAttempting to connect to
{0}â¦/string
string name=selector_dialog_connectionfailedImpress Remote could not
connect to {0}./string
@@ -42,10 +42,10 @@
string name=about_copyrightCopyright © 2012 LibreOffice Contributors
and/or their affiliates./string
string name=about_licenceThis app is released under the Mozilla Public
License, v. 2.0./string
string name=about_librariesThis app uses
android-coverflow\n\tCopyright © 2011, Polidea\n\tNew BSD License.\n\nThis app
uses ActionBarSherlock:\n\tCopyright 2012 Jake Wharton\n\tLicensed under the
Apache License, Version 2.0 (the License)/string
-string name=addserverAdd Server/string
-string name=addserver_enternameServer name:/string
-string name=addserver_enteraddressServer address as IP or
hostname:/string
-string name=addserver_rememberRemember this server next time/string
+string name=addserverAdd Computer Manually/string
+string name=addserver_enternameComputer name:/string
+string name=addserver_enteraddressComputer IP address or
hostname:/string
+string name=addserver_rememberRemember this computer next time/string
string name=addserver_addAdd/string
string name=addserver_cancelCancel/string
string name=reconnect_description1Your connection has been
dropped./string
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/values/strings.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ea264f0c8165eb0c62bf624af5f450b20898469f Author: Tor Lillqvist t...@iki.fi Date: Wed Feb 13 09:26:42 2013 +0200 Ah, manually adding computers is for non-Bluetooth ones So yeah, need to keep this feature. Spell Wi-Fi correctly, and mention Wi-Fi in the menu button. Change-Id: I4cd6f0689a6ff9647f355d4b1404be84ec0c0138 diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index 80493f9..a08edd1 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -23,7 +23,7 @@ string name=options_switchcomputerSwitch computer/string string name=blankscreen_returnReturn to Slide/string string name=bluetoothBluetooth/string -string name=wifiWI-FI/string +string name=wifiWi-Fi/string string name=selector_noserversSearching for computersâ¦/string string name=selector_deleteRemove computer/string string name=selector_choose_a_computerChoose a Computer/string @@ -42,7 +42,7 @@ string name=about_copyrightCopyright © 2012 LibreOffice Contributors and/or their affiliates./string string name=about_licenceThis app is released under the Mozilla Public License, v. 2.0./string string name=about_librariesThis app uses android-coverflow\n\tCopyright © 2011, Polidea\n\tNew BSD License.\n\nThis app uses ActionBarSherlock:\n\tCopyright 2012 Jake Wharton\n\tLicensed under the Apache License, Version 2.0 (the License)/string -string name=addserverAdd Computer Manually/string +string name=addserverAdd Wi-Fi Computer Manually/string string name=addserver_enternameComputer name:/string string name=addserver_enteraddressComputer IP address or hostname:/string string name=addserver_rememberRemember this computer next time/string ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/.gitignore |1 + android/sdremote/ant.properties | 17 - 2 files changed, 1 insertion(+), 17 deletions(-) New commits: commit 412d3cfd957f4d8a068121d1cef5f231959baf5b Author: Thorsten Behrens tbehr...@suse.com Date: Mon Feb 11 23:39:00 2013 +0100 Remove empty ant.properties And ignore it henceforth - it will be usefull locally for release code signing. Change-Id: If870a39140541834bd97fb247967712f30acff63 diff --git a/android/sdremote/.gitignore b/android/sdremote/.gitignore index b04e09d..211e4ff 100644 --- a/android/sdremote/.gitignore +++ b/android/sdremote/.gitignore @@ -1 +1,2 @@ /translations* +/ant.properties diff --git a/android/sdremote/ant.properties b/android/sdremote/ant.properties deleted file mode 100644 index b0971e8..000 --- a/android/sdremote/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b66f4d71376553c2cddf592385d7b01a4e313120 Author: Thorsten Behrens tbehr...@suse.com Date: Mon Feb 11 23:50:17 2013 +0100 Bump Impress Remote version. Change-Id: Ife0d461fa7b1f4f0436a3470ceee18af46d090f2 diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index b71510a..1d42b27 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote -android:versionCode=2 -android:versionName=Impress Remote 1.0.0+ +android:versionCode=3 +android:versionName=1.0.1+ Impress Remote uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 07c99eff32c4c60786c001c2e51c35b7f1d9268f Author: Thorsten Behrens tbehr...@suse.com Date: Tue Feb 12 00:58:46 2013 +0100 Bump Impress Remote version. Change-Id: I94cae8873edb3efc449f9dfe8687e70a17d26a68 diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 1d42b27..2eca7d7 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote -android:versionCode=3 -android:versionName=1.0.1+ Impress Remote +android:versionCode=4 +android:versionName=1.0.2+ Impress Remote uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
4
1 file changed, 4 insertions(+)
New commits:
commit a75aeb5cefd338d44dd36a8892e63c1095c71273
Author: Michael Meeks michael.me...@suse.com
Date: Fri Feb 8 14:53:47 2013 +
fdo#60487 - sdremote - load default preferences eg. volume control switch.
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 9de25ed..8ca76e7 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -58,6 +58,10 @@ public class PresentationActivity extends
SherlockFragmentActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+// bind preference defaults
+PreferenceManager.setDefaultValues(this, R.xml.preferences,
+ false /* retain user settings */);
+
mBroadcastProcessor = new ActivityChangeBroadcastProcessor(this);
bindService(new Intent(this, CommunicationService.class), mConnection,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 960f1c2c7ba5d890fd245a90f78277ef73a873de Author: Thorsten Behrens tbehr...@suse.com Date: Thu Feb 7 17:13:39 2013 +0100 Update Impress Remote version. Change-Id: I12ad4604d0426a52b47d99d1bc3c4c6536e83b07 diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index bd38fab..b71510a 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote -android:versionCode=1 -android:versionName=0.1-Alpha +android:versionCode=2 +android:versionName=Impress Remote 1.0.0+ uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.BLUETOOTH / @@ -58,4 +58,4 @@ /activity /application -/manifest \ No newline at end of file +/manifest ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 12f2baa316ce283020ea200836c7bb587c3d577f
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Feb 7 11:37:49 2013 +0100
sdremote - always replace fragments, to avoid stale content
With Change-Id I7cb1cf29bcae59ef26cf3bf0c2b3dd028eb8f878, this code
gets run on every onCreate, thus adding activities on top of
existing ones. Seems FragmentManager lifetime is a bit decoupled
from Activity
Change-Id: Icc1dc86ef91257ce734ee00fed83e909ddf52dc8
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index eb992f1..9de25ed 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -78,8 +78,8 @@ public class PresentationActivity extends
SherlockFragmentActivity {
FragmentTransaction fragmentTransaction = fragmentManager
.beginTransaction();
-fragmentTransaction.add(R.id.presentation_interceptor,
-mPresentationFragment,
fragment_presentation);
+fragmentTransaction.replace(R.id.presentation_interceptor,
+mPresentationFragment,
fragment_presentation);
fragmentTransaction.commit();
mOuterLayout = (FrameLayout) findViewById(R.id.framelayout);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/values/strings.xml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f3e42e07da568553b7e2c056259a2667d6789ca3
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Feb 7 15:37:37 2013 +0100
Clarify android-coverflow license.
See http://code.google.com/p/android-coverflow/source/browse/LICENCE.txt
Change-Id: I29cd2f9115f9c711dc07d8efbe89e42bedab040f
diff --git a/android/sdremote/res/values/strings.xml
b/android/sdremote/res/values/strings.xml
index 9beaab7..e84b7fa 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -41,7 +41,7 @@
string name=about_versionstringVersion: {0} (Build ID: {1})/string
string name=about_copyrightCopyright © 2012 LibreOffice Contributors
and/or their affiliates./string
string name=about_licenceThis app is released under the Mozilla Public
License, v. 2.0./string
-string name=about_librariesThis app uses
android-coverflow\n\tCopyright © 2011, Polidea\n\tAll rights reserved.\n\nThis
app uses ActionBarSherlock:\n\tCopyright 2012 Jake Wharton\n\tLicensed under
the Apache License, Version 2.0 (the License)/string
+string name=about_librariesThis app uses
android-coverflow\n\tCopyright © 2011, Polidea\n\tNew BSD License.\n\nThis app
uses ActionBarSherlock:\n\tCopyright 2012 Jake Wharton\n\tLicensed under the
Apache License, Version 2.0 (the License)/string
string name=addserverAdd Server/string
string name=addserver_enternameServer name:/string
string name=addserver_enteraddressServer address as IP or
hostname:/string
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/values/styles.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5adefb21244ca57b95e9f8df6ec18880438201bf Author: Joren De Cuyper joren.libreoff...@telenet.be Date: Thu Feb 7 19:43:44 2013 +0100 resolve fdo#60379 Impress Remote: Options look disabled Change-Id: Ifb760fd0a0fa1430b77838a0340cc0956a0201a7 Reviewed-on: https://gerrit.libreoffice.org/2029 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml index 80a4b4a..c88c947 100644 --- a/android/sdremote/res/values/styles.xml +++ b/android/sdremote/res/values/styles.xml @@ -72,9 +72,9 @@ item name=android:actionDropDownStyle@style/Theme.ImpressRemote.ActionBarMenu/item item name=android:windowBackground@color/light_grey/item item name=android:homeAsUpIndicator@drawable/up_indicator_white/item -item name=android:textColor@color/text_grey/item +item name=android:textColor@color/light_grey/item item name=android:alertDialogStyle@style/Theme.ImpressRemote.Dialog/item /style -/resources \ No newline at end of file +/resources ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/xml/preferences.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 06535009ce1fb8c3f6dc0bc3d464ada531365f31 Author: Michael Meeks michael.me...@suse.com Date: Wed Feb 6 10:29:15 2013 + sdremote - enable volume control slide-switching by default. This is far and away the easiest way to switch slide. The coverflow with it's physics / momentum is really no-where near as useful. diff --git a/android/sdremote/res/xml/preferences.xml b/android/sdremote/res/xml/preferences.xml index ad7b1b3..292c851 100644 --- a/android/sdremote/res/xml/preferences.xml +++ b/android/sdremote/res/xml/preferences.xml @@ -3,7 +3,7 @@ !-- SwitchPreference android:defaultValue=false android:title=@string/options_autodecline android:key=option_autodecline/ -- CheckBoxPreference -android:defaultValue=false +android:defaultValue=true android:key=option_volumeswitching android:summary=@string/options_volumeswitching_descripton android:title=@string/options_volumeswitching / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java |
12 +-
android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java|
4 ++-
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 8db1ba5d22fe8b1b528f5873480e4db1b1f33d4c
Author: Michael Meeks michael.me...@suse.com
Date: Wed Jan 30 19:42:32 2013 +1100
sdremote - don't let incoming thumbnails crash us if we switched view.
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 555d3e1..9ad3b79 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -148,7 +148,8 @@ public class PresentationFragment extends SherlockFragment {
LocalBroadcastManager
.getInstance(getActivity().getApplicationContext())
.unregisterReceiver(mListener);
-
+mTopView = null;
+mContext = null;
}
private void updateSlideNumberDisplay(int aPosition) {
@@ -259,6 +260,9 @@ public class PresentationFragment extends SherlockFragment {
@Override
public void onReceive(Context aContext, Intent aIntent) {
+
+if (mTopView == null || mTopView.getAdapter() == null)
+return;
if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_CHANGED)) {
int aSlide = aIntent.getExtras().getInt(slide_number);
@@ -271,10 +275,8 @@ public class PresentationFragment extends SherlockFragment
{
mTopView.setSelection(aSlide, true);
} else if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_PREVIEW)) {
-// int aNSlide = aIntent.getExtras().getInt(slide_number);
-((ThumbnailAdapter) mTopView.getAdapter())
-.notifyDataSetChanged();
-//mTopView.requestLayout();
+ThumbnailAdapter aThumbAdaptor = (ThumbnailAdapter)
mTopView.getAdapter();
+aThumbAdaptor.notifyDataSetChanged();
} else if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_NOTES)) {
int aPosition = aIntent.getExtras().getInt(slide_number);
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
index c7731ee..dace201 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
@@ -155,6 +155,8 @@ public class ThumbnailFragment extends SherlockFragment {
@Override
public void onReceive(Context aContext, Intent aIntent) {
+if (mGrid == null)
+return;
if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_CHANGED)) {
int aSlide = aIntent.getExtras().getInt(slide_number);
@@ -234,4 +236,4 @@ public class ThumbnailFragment extends SherlockFragment {
}
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
