diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-07-25 18:01:22 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:23:02 +0100 |
| commit | 499f5897115f1f3b4795dceae275b3f43fe1582e (patch) | |
| tree | e4116b27752b3c72ba32c7a3b29c62a19b3c2537 /android | |
| parent | 91d4180ba673dccf424fb71078e9074841be9f78 (diff) | |
Prepared clock button.
Change-Id: I481885d7f9508dca887380d7f577bb35b04d6b07
Diffstat (limited to 'android')
3 files changed, 6 insertions, 4 deletions
diff --git a/android/sdremote/res/layout/presentation_actionbar.xml b/android/sdremote/res/layout/presentation_actionbar.xml index 818748bd7366..1fd3bae96fe2 100644 --- a/android/sdremote/res/layout/presentation_actionbar.xml +++ b/android/sdremote/res/layout/presentation_actionbar.xml @@ -12,10 +12,12 @@ android:textOff="" android:textOn="" /> - <TextView + <ToggleButton android:id="@+id/actionbar_time" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_gravity="center" + android:background="@drawable/actionbar_toggle" android:gravity="center" android:textColor="#FFFFFF" android:textSize="22dp" /> diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml index 04143c4958ef..bb11845e4ad1 100644 --- a/android/sdremote/res/values/styles.xml +++ b/android/sdremote/res/values/styles.xml @@ -13,6 +13,7 @@ <style name="Theme.ImpressRemote.ActionBar" parent="android:style/Widget.Holo.Light.ActionBar"> <item name="android:background">@color/orange</item> + <item name="android:displayOptions">showCustom</item> </style> <style name="Theme.ImpressRemote.ActionBarWidget" parent="android:style/Widget.Holo.Light"> diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java index 795ab53e9cd3..234042dba459 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java @@ -20,7 +20,6 @@ import android.view.Menu; import android.view.View; import android.view.View.OnClickListener; import android.widget.FrameLayout; -import android.widget.TextView; import android.widget.ToggleButton; public class PresentationActivity extends Activity { @@ -107,7 +106,7 @@ public class PresentationActivity extends Activity { private class ActionBarManager implements OnClickListener, FragmentManager.OnBackStackChangedListener { - private TextView mTimeLabel; + private ToggleButton mTimeLabel; private ToggleButton mThumbnailButton; private String aTimeFormat = getResources().getString( @@ -134,7 +133,7 @@ public class PresentationActivity extends Activity { .findViewById(R.id.actionbar_thumbnailtoggle); mThumbnailButton.setOnClickListener(this); - mTimeLabel = (TextView) aBar.getCustomView().findViewById( + mTimeLabel = (ToggleButton) aBar.getCustomView().findViewById( R.id.actionbar_time); mThumbnailButton.setOnClickListener(this); |