[Libreoffice-commits] .: android/sdremote
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 20 08:24:34 PDT 2012
android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java | 5 +-
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java | 19 +++++-----
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java | 4 +-
android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java | 5 +-
android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java | 5 +-
android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java | 5 +-
6 files changed, 24 insertions(+), 19 deletions(-)
New commits:
commit 34322a1360dd6e10df4212a9fa7d050abcb64dbf
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Mon Aug 20 17:23:40 2012 +0200
More ABS migration.
Change-Id: If56d5c7f8c28248215cf558b03eabe1f5b4569ff
diff --git a/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java b/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
index e849125..3760b22 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/BlankScreenFragment.java
@@ -8,14 +8,15 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.RectF;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ImageView;
-public class BlankScreenFragment extends Fragment {
+import com.actionbarsherlock.app.SherlockFragment;
+
+public class BlankScreenFragment extends SherlockFragment {
CommunicationService mCommunicationService;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 13bff68..2ce7db1 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -7,7 +7,6 @@ import java.util.TimeZone;
import org.libreoffice.impressremote.communication.CommunicationService;
import org.libreoffice.impressremote.communication.SlideShow.Timer;
-import android.app.ActionBar;
import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Context;
@@ -18,14 +17,11 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.preference.PreferenceManager;
-import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.text.format.DateFormat;
import android.view.KeyEvent;
import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
@@ -35,7 +31,10 @@ import android.widget.FrameLayout;
import android.widget.TextView;
import android.widget.ToggleButton;
-public class PresentationActivity extends FragmentActivity {
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
+public class PresentationActivity extends SherlockFragmentActivity {
private CommunicationService mCommunicationService;
private boolean mIsBound = false;
private FrameLayout mLayout;
@@ -126,15 +125,17 @@ public class PresentationActivity extends FragmentActivity {
};
// ---------------------------------------------- ACTION BAR ---------------
+
@Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.actionbar_presentation, menu);
+ public boolean onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu) {
+ getSupportMenuInflater().inflate(R.menu.actionbar_presentation, menu);
mActionBarManager = new ActionBarManager();
return true;
}
@Override
- public boolean onOptionsItemSelected(MenuItem item) {
+ public boolean onOptionsItemSelected(
+ com.actionbarsherlock.view.MenuItem item) {
Intent aIntent;
switch (item.getItemId()) {
case R.id.actionbar_presentation_submenu_options:
@@ -209,7 +210,7 @@ public class PresentationActivity extends FragmentActivity {
public ActionBarManager() {
- ActionBar aBar = getActionBar();
+ ActionBar aBar = getSupportActionBar();
aBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
aBar.setCustomView(R.layout.presentation_actionbar);
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 21aeb49..3b7bdca 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -16,7 +16,6 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.RectF;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import android.support.v4.content.LocalBroadcastManager;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -29,8 +28,9 @@ import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ImageView;
import android.widget.TextView;
-public class PresentationFragment extends Fragment {
+import com.actionbarsherlock.app.SherlockFragment;
+public class PresentationFragment extends SherlockFragment {
private CoverFlow mTopView;
private ImageView mHandle;
private View mLayout;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index 267636f..82cb81c 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
@@ -16,7 +16,6 @@ import org.libreoffice.impressremote.communication.CommunicationService;
import org.libreoffice.impressremote.communication.Server;
import org.libreoffice.impressremote.communication.Server.Protocol;
-import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -30,7 +29,9 @@ import android.view.View.OnClickListener;
import android.widget.LinearLayout;
import android.widget.TextView;
-public class SelectorActivity extends Activity {
+import com.actionbarsherlock.app.SherlockActivity;
+
+public class SelectorActivity extends SherlockActivity {
private CommunicationService mCommunicationService;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
index 77e1d57..b21fe66 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
@@ -2,7 +2,6 @@ package org.libreoffice.impressremote;
import org.libreoffice.impressremote.communication.CommunicationService;
-import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -15,7 +14,9 @@ import android.support.v4.content.LocalBroadcastManager;
import android.view.View;
import android.view.View.OnClickListener;
-public class StartPresentationActivity extends Activity {
+import com.actionbarsherlock.app.SherlockActivity;
+
+public class StartPresentationActivity extends SherlockActivity {
private CommunicationService mCommunicationService = null;
private boolean mIsBound = false;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java b/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
index b909fa7..4532177 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
@@ -18,7 +18,6 @@ import android.content.IntentFilter;
import android.graphics.Bitmap;
import android.graphics.Typeface;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import android.support.v4.content.LocalBroadcastManager;
import android.view.LayoutInflater;
import android.view.View;
@@ -30,7 +29,9 @@ import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
import android.widget.TextView;
-public class ThumbnailFragment extends Fragment {
+import com.actionbarsherlock.app.SherlockFragment;
+
+public class ThumbnailFragment extends SherlockFragment {
private CommunicationService mCommunicationService;
More information about the Libreoffice-commits
mailing list