[Libreoffice-commits] core.git: 6 commits - android/sdremote
Artur Dryomov
artur.dryomov at gmail.com
Tue Jul 30 13:56:33 PDT 2013
android/sdremote/AndroidManifest.xml | 18 +++--
android/sdremote/res/drawable/background_pager_slide.xml | 17 -----
android/sdremote/res/layout/fragment_slides_pager.xml | 2
android/sdremote/res/layout/view_grid_slide.xml | 1
android/sdremote/res/layout/view_pager_slide.xml | 1
android/sdremote/res/values/dimens.xml | 5 -
android/sdremote/res/values/strings.xml | 5 +
android/sdremote/res/values/themes.xml | 4 -
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java | 16 ++---
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java | 19 ++----
android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java | 12 +++
android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java | 5 -
android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java | 31 ++++++----
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java | 2
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java | 22 +++++--
android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java | 10 +++
android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java | 10 +++
17 files changed, 111 insertions(+), 69 deletions(-)
New commits:
commit c12137a876dd9405b20c094c99b72c672a161422
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Tue Jul 30 22:46:03 2013 +0300
Add changing local slide when remote slide was changed.
Change-Id: If7325a0266484686549a0c1073827613aa40cb85
diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
index adbc74b..3092503 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
@@ -27,7 +27,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextSwitcher;
-import android.widget.TextView;
import android.widget.ViewAnimator;
import com.actionbarsherlock.app.SherlockFragment;
@@ -74,9 +73,10 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn
ViewPager aSlidesPager = getSlidesPager();
aSlidesPager.setAdapter(buildSlidesAdapter());
- aSlidesPager.setCurrentItem(mCommunicationService.getSlideShow().getCurrentSlideIndex());
aSlidesPager.setPageMargin(getSlidesMarginInPx());
aSlidesPager.setOnPageChangeListener(this);
+
+ setUpCurrentSlide();
}
private ViewPager getSlidesPager() {
@@ -97,6 +97,12 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn
return (int) TypedValue.applyDimension(aPxUnit, aSlideMarginInDp, aDisplayMetrics);
}
+ private void setUpCurrentSlide() {
+ SlideShow aSlideShow = mCommunicationService.getSlideShow();
+
+ getSlidesPager().setCurrentItem(aSlideShow.getCurrentSlideIndex());
+ }
+
@Override
public void onPageSelected(int aPosition) {
mCommunicationService.getTransmitter().setCurrentSlide(aPosition);
@@ -172,16 +178,21 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn
}
private static final class IntentsReceiver extends BroadcastReceiver {
- private final SlidesPagerFragment mSlidesGridFragment;
+ private final SlidesPagerFragment mSlidesPagerFragment;
private IntentsReceiver(SlidesPagerFragment aSlidesGridFragment) {
- mSlidesGridFragment = aSlidesGridFragment;
+ mSlidesPagerFragment = aSlidesGridFragment;
}
@Override
public void onReceive(Context aContext, Intent aIntent) {
if (Intents.Actions.SLIDE_PREVIEW.equals(aIntent.getAction())) {
- mSlidesGridFragment.refreshSlidesPager();
+ mSlidesPagerFragment.refreshSlidesPager();
+ return;
+ }
+
+ if (Intents.Actions.SLIDE_CHANGED.equals(aIntent.getAction())) {
+ mSlidesPagerFragment.setUpCurrentSlide();
}
}
}
@@ -189,6 +200,7 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn
private IntentFilter buildIntentsReceiverFilter() {
IntentFilter aIntentFilter = new IntentFilter();
aIntentFilter.addAction(Intents.Actions.SLIDE_PREVIEW);
+ aIntentFilter.addAction(Intents.Actions.SLIDE_CHANGED);
return aIntentFilter;
}
commit e291784e0ca450c25f9dd691234c57f753d648dc
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Tue Jul 30 19:44:47 2013 +0300
Fix tiny source code issues.
* Add headers and footers.
* Remove unused resources.
* Fix classes usage.
Change-Id: Id9580f21709b11077e46393c2e2cf8d911ce0650
diff --git a/android/sdremote/res/drawable/background_pager_slide.xml b/android/sdremote/res/drawable/background_pager_slide.xml
deleted file mode 100644
index c65e424..0000000
--- a/android/sdremote/res/drawable/background_pager_slide.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
- <solid
- android:color="@android:color/transparent" />
-
- <stroke
- android:width="3dp"
- android:color="@color/stroke_pager_slide"/>
-
- <padding
- android:left="0dp"
- android:top="1dp"
- android:right="0dp"
- android:bottom="2dp"/>
-
-</shape>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/fragment_slides_pager.xml b/android/sdremote/res/layout/fragment_slides_pager.xml
index 20b4336..e51518d 100644
--- a/android/sdremote/res/layout/fragment_slides_pager.xml
+++ b/android/sdremote/res/layout/fragment_slides_pager.xml
@@ -40,7 +40,7 @@
android:textStyle="bold"
android:textColor="@color/background_header"
android:drawableBottom="@drawable/underline_header"
- android:drawablePadding="4dp"
+ android:drawablePadding="@dimen/padding_header_underline"
android:paddingLeft="@dimen/padding_header"
android:paddingTop="@dimen/padding_header"
android:gravity="left"
diff --git a/android/sdremote/res/layout/view_grid_slide.xml b/android/sdremote/res/layout/view_grid_slide.xml
index 2cda3bf..a79ca3e 100644
--- a/android/sdremote/res/layout/view_grid_slide.xml
+++ b/android/sdremote/res/layout/view_grid_slide.xml
@@ -9,6 +9,7 @@
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:background="@drawable/background_grid_slide"
+ android:contentDescription="@string/description_grid_slide"
android:layout_alignParentTop="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
diff --git a/android/sdremote/res/layout/view_pager_slide.xml b/android/sdremote/res/layout/view_pager_slide.xml
index 6ca8f91..6b2dc4e 100644
--- a/android/sdremote/res/layout/view_pager_slide.xml
+++ b/android/sdremote/res/layout/view_pager_slide.xml
@@ -2,5 +2,6 @@
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/image_slide_preview"
android:scaleType="fitCenter"
+ android:contentDescription="@string/description_pager_slide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
\ No newline at end of file
diff --git a/android/sdremote/res/values/dimens.xml b/android/sdremote/res/values/dimens.xml
index bedf4e1..9739e15 100644
--- a/android/sdremote/res/values/dimens.xml
+++ b/android/sdremote/res/values/dimens.xml
@@ -10,7 +10,6 @@
<dimen name="padding_slides_pager">16dp</dimen>
<dimen name="padding_slide">4dp</dimen>
<dimen name="padding_header_underline">4dp</dimen>
- <dimen name="padding_slides_pager_layout">8dp</dimen>
<dimen name="padding_header">8dp</dimen>
<dimen name="padding_slide_notes">8dp</dimen>
diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index 02c0160..2f5117a 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -46,4 +46,7 @@
<item quantity="other">%d minutes left</item>
</plurals>
+ <string name="description_pager_slide">Slide preview</string>
+ <string name="description_grid_slide">Slide preview</string>
+
</resources>
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
index 279eaae..377f596 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
@@ -9,11 +9,12 @@
package org.libreoffice.impressremote.activity;
import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
+import android.support.v4.app.Fragment;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.MenuItem;
import org.libreoffice.impressremote.fragment.ComputerConnectionFragment;
+import org.libreoffice.impressremote.util.FragmentOperator;
import org.libreoffice.impressremote.util.Intents;
import org.libreoffice.impressremote.communication.Server;
@@ -23,21 +24,18 @@ public class ComputerConnectionActivity extends SherlockFragmentActivity {
super.onCreate(savedInstanceState);
setUpHomeButton();
-
- setUpComputerConnectionFragment(extractReceivedComputer());
+ setUpFragment();
}
private void setUpHomeButton() {
getSupportActionBar().setHomeButtonEnabled(true);
}
- private void setUpComputerConnectionFragment(Server aComputer) {
- FragmentTransaction aTransaction = getSupportFragmentManager().beginTransaction();
-
- aTransaction.replace(android.R.id.content, ComputerConnectionFragment
- .newInstance(aComputer));
+ private void setUpFragment() {
+ Server aComputer = extractReceivedComputer();
+ Fragment aFragment = ComputerConnectionFragment.newInstance(aComputer);
- aTransaction.commit();
+ FragmentOperator.addFragment(this, aFragment);
}
private Server extractReceivedComputer() {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
index 372e49b..5ff79ac 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
@@ -34,10 +34,10 @@ public class ComputerCreationActivity extends SherlockFragmentActivity implement
}
private void setUpActionBar() {
- View aView = buildCustomActionBarView();
- ActionBar.LayoutParams aLayoutParams = buildCustomActionBarLayoutParams();
+ View aActionBarView = buildCustomActionBarView();
+ ActionBar.LayoutParams aActionBarParams = buildCustomActionBarLayoutParams();
- getSupportActionBar().setCustomView(aView, aLayoutParams);
+ getSupportActionBar().setCustomView(aActionBarView, aActionBarParams);
getCancelButton().setOnClickListener(this);
getSaveButton().setOnClickListener(this);
@@ -45,8 +45,7 @@ public class ComputerCreationActivity extends SherlockFragmentActivity implement
private View buildCustomActionBarView() {
Context aContext = getSupportActionBar().getThemedContext();
- LayoutInflater aInflater = (LayoutInflater) aContext.getSystemService(
- LAYOUT_INFLATER_SERVICE);
+ LayoutInflater aInflater = LayoutInflater.from(aContext);
return aInflater.inflate(R.layout.action_bar_computer_creation, null);
}
@@ -90,11 +89,10 @@ public class ComputerCreationActivity extends SherlockFragmentActivity implement
}
if (TextUtils.isEmpty(aName)) {
- finish(aIpAddress, aIpAddress);
- }
- else {
- finish(aIpAddress, aName);
+ aName = aIpAddress;
}
+
+ finish(aIpAddress, aName);
}
private String getText(EditText aEdit) {
@@ -114,8 +112,7 @@ public class ComputerCreationActivity extends SherlockFragmentActivity implement
}
private void finish(String aIpAddress, String aName) {
- Intent aIntent = Intents
- .buildComputerCreationResultIntent(aIpAddress, aName);
+ Intent aIntent = Intents.buildComputerCreationResultIntent(aIpAddress, aName);
setResult(Activity.RESULT_OK, aIntent);
finish();
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java
index 5b74de3..8d3dc63 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java
@@ -27,15 +27,14 @@ public class LicensesActivity extends SherlockActivity {
setContentView(R.layout.activity_licenses);
setUpHomeButton();
-
- setUpLicenses();
+ setUpContent();
}
private void setUpHomeButton() {
getSupportActionBar().setHomeButtonEnabled(true);
}
- private void setUpLicenses() {
+ private void setUpContent() {
getLicensesView().loadUrl(buildLicensesUri());
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
index 06967d1..f739394 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
@@ -20,6 +20,7 @@ import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.content.LocalBroadcastManager;
+import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
@@ -167,8 +168,10 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
return;
}
- getSupportActionBar().setTitle(buildSlideShowProgress());
- getSupportActionBar().setSubtitle(buildSlideShowTimerProgress());
+ ActionBar aActionBar = getSupportActionBar();
+
+ aActionBar.setTitle(buildSlideShowProgress());
+ aActionBar.setSubtitle(buildSlideShowTimerProgress());
}
private boolean isServiceBound() {
@@ -307,23 +310,31 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
Timer aTimer = mCommunicationService.getSlideShow().getTimer();
if (aTimer.isSet()) {
- int aTimerLength = aTimer.getMinutesLeft();
-
- DialogFragment aFragment = TimerEditingDialog.newInstance(aTimerLength);
- aFragment.show(getSupportFragmentManager(), TimerEditingDialog.TAG);
-
- pauseTimer();
+ callEditingTimer(aTimer);
}
else {
- DialogFragment aFragment = TimerSettingDialog.newInstance();
- aFragment.show(getSupportFragmentManager(), TimerSettingDialog.TAG);
+ callSettingTimer();
}
}
+ private void callEditingTimer(Timer aTimer) {
+ int aTimerLength = aTimer.getMinutesLeft();
+
+ DialogFragment aFragment = TimerEditingDialog.newInstance(aTimerLength);
+ aFragment.show(getSupportFragmentManager(), TimerEditingDialog.TAG);
+
+ pauseTimer();
+ }
+
private void pauseTimer() {
mCommunicationService.getSlideShow().getTimer().pause();
}
+ private void callSettingTimer() {
+ DialogFragment aFragment = TimerSettingDialog.newInstance();
+ aFragment.show(getSupportFragmentManager(), TimerSettingDialog.TAG);
+ }
+
private void stopSlideShow() {
mCommunicationService.getTransmitter().stopPresentation();
diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
index 25e2819..dcfd6ef 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
@@ -50,7 +50,7 @@ public class SlidesGridFragment extends SherlockFragment implements ServiceConne
}
private void bindService() {
- Intent aServiceIntent = new Intent(getActivity(), CommunicationService.class);
+ Intent aServiceIntent = Intents.buildCommunicationServiceIntent(getActivity());
getActivity().bindService(aServiceIntent, this, Context.BIND_AUTO_CREATE);
}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
index accfd8b..ed7c853 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
@@ -1,3 +1,11 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
package org.libreoffice.impressremote.fragment;
import java.util.concurrent.TimeUnit;
@@ -134,3 +142,5 @@ public class TimerEditingDialog extends SherlockDialogFragment implements TimePi
aDialog.updateTime(0, 0);
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
index 99374f8..5375de8 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
@@ -1,3 +1,11 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
package org.libreoffice.impressremote.fragment;
import java.util.concurrent.TimeUnit;
@@ -70,3 +78,5 @@ public class TimerSettingDialog extends SherlockDialogFragment implements TimePi
LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(aIntent);
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0a483508689c08d57feb5db32997125727f0e50d
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Tue Jul 30 16:27:00 2013 +0300
Change Impress Remote version.
Bump it to 1.1 and remote additional text from version name because it
is useless.
Change-Id: I6fbd0dc3b499c5aafc80b91c77372360c2767189
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml
index 842972f..109c1c2 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.libreoffice.impressremote"
android:versionCode="8"
- android:versionName="1.0.6+ Impress Remote"
+ android:versionName="1.1"
android:installLocation="auto">
<uses-permission
commit c1b522c591bc9316c21cc3af4f183f59bb28dfad
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Tue Jul 30 16:14:43 2013 +0300
Remove explicit Bluetooth requirement.
Devices without Bluetooth should be able to use the app as well via WiFi
connections. This change should remove some Google Play filtering so
these devices will be able to download the app from the store.
Change-Id: Iebc2f14e0bc57ea7293f8abfa1824b99c4476e8b
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml
index 938e0e6..842972f 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -5,9 +5,16 @@
android:versionName="1.0.6+ Impress Remote"
android:installLocation="auto">
- <uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.BLUETOOTH"/>
- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+ <uses-permission
+ android:name="android.permission.INTERNET"/>
+ <uses-permission
+ android:name="android.permission.BLUETOOTH"/>
+ <uses-permission
+ android:name="android.permission.BLUETOOTH_ADMIN"/>
+
+ <uses-feature
+ android:name="android.hardware.bluetooth"
+ android:required="false"/>
<uses-sdk
android:minSdkVersion="10"
commit c01a2c8284b17c1a28501f25caeedeace62494c9
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Tue Jul 30 15:55:38 2013 +0300
Fix application and first activity titles bug.
Change-Id: I066af1301c8e5525b5ade310c770273f72007b10
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml
index 73f3c23..938e0e6 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -21,10 +21,9 @@
<activity
android:name=".activity.ComputersActivity"
- android:label="@string/title_computers"
android:theme="@style/Theme.ImpressRemote.Computers">
- <intent-filter android:label="@string/application_name">
+ <intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
diff --git a/android/sdremote/res/values/themes.xml b/android/sdremote/res/values/themes.xml
index 20a4b22..bdf73a3 100644
--- a/android/sdremote/res/values/themes.xml
+++ b/android/sdremote/res/values/themes.xml
@@ -31,8 +31,8 @@
<item name="android:navigationMode">tabMode</item>
<item name="navigationMode">tabMode</item>
- <item name="android:displayOptions">showTitle|showHome|useLogo</item>
- <item name="displayOptions">showTitle|showHome|useLogo</item>
+ <item name="android:displayOptions">showHome|useLogo</item>
+ <item name="displayOptions">showHome|useLogo</item>
</style>
<style name="Theme.ImpressRemote.ComputerCreation" parent="Theme.ImpressRemote">
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
index 2dd3b0b..8054b89 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -31,9 +31,21 @@ public class ComputersActivity extends SherlockFragmentActivity implements Actio
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setUpTitle();
setUpContent();
}
+ private void setUpTitle() {
+ // Looks hacky but it seems to be the best way to set activity title
+ // different to application’s label. The other way is setting title
+ // to intents filter but it shows wrong label for recent apps screen.
+
+ ActionBar aActionBar = getSupportActionBar();
+
+ aActionBar.setTitle(R.string.title_computers);
+ aActionBar.setDisplayShowTitleEnabled(true);
+ }
+
private void setUpContent() {
if (BluetoothOperator.isAvailable()) {
setUpComputersLists();
commit 2ba929e40cc4e128de51468c9e9315c3c851544a
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Tue Jul 30 15:26:03 2013 +0300
Change resources a bit.
* Fix spelling.
* Fix dimens to use common 8dp-measured grid.
Change-Id: I92e433eba3b78822f36e8e9f242daa3d893a36f5
diff --git a/android/sdremote/res/values/dimens.xml b/android/sdremote/res/values/dimens.xml
index 9a079a6..bedf4e1 100644
--- a/android/sdremote/res/values/dimens.xml
+++ b/android/sdremote/res/values/dimens.xml
@@ -19,8 +19,8 @@
<dimen name="padding_horizontal_action_bar_button">20dp</dimen>
<dimen name="padding_horizontal_action_bar_divider">12dp</dimen>
- <dimen name="padding_vertical_pin">10dp</dimen>
- <dimen name="padding_vertical_error_message">10dp</dimen>
+ <dimen name="padding_vertical_pin">8dp</dimen>
+ <dimen name="padding_vertical_error_message">12dp</dimen>
<dimen name="padding_vertical_edit">8dp</dimen>
<dimen name="padding_vertical_notice">16dp</dimen>
diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index f315add..02c0160 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -32,7 +32,7 @@
<string name="message_impress_wifi_enabling">You should enable experimental features at “Tools → Options → LibreOffice → Advanced†as well.</string>
<string name="message_impress_pairing_check">If you have Bluetooth pairing issues check instructions related to your desktop OS.</string>
<string name="message_ip_address_validation">You should type a valid IP address.</string>
- <string name="message_name_notice">Name is optional — IP address would be used instead if you wish.</string>
+ <string name="message_name_notice">Name is not required — IP address would be used instead if you wish.</string>
<string name="message_time_is_up">Time is up</string>
<string name="hint_ip_address">IP address</string>
More information about the Libreoffice-commits
mailing list