Kaydet (Commit) 7af4168b authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt

Fixes to run on Android 2.3

Change-Id: I5934264083a1cd7b33fdcd9869957c222825df60
üst e5441d69
......@@ -9,4 +9,4 @@
android.library=true
# Project target.
target=android-15
target=android-14
......@@ -9,8 +9,8 @@
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="14" />
android:minSdkVersion="10"
android:targetSdkVersion="10" />
<application
android:label="@string/app_name"
......
......@@ -19,9 +19,11 @@
<item name="android:textSize">18dp</item>
</style>
<style name="Theme.ImpressRemote.ActionBar" parent="android:style/Widget.Holo.Light.ActionBar">
<style name="Theme.ImpressRemote.ActionBar" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
<item name="android:background">@color/orange</item>
<item name="background">@color/orange</item>
<item name="android:titleTextStyle">@style/Theme.ImpressRemote.ActionBar.Title</item>
<item name="titleTextStyle">@style/Theme.ImpressRemote.ActionBar.Title</item>
</style>
<style name="Theme.ImpressRemote.ActionBarWidget" parent="android:style/Widget.Holo.Light">
......@@ -35,14 +37,16 @@
<!-- <item name="android:popupBackground">@color/black</item> -->
</style>
<style name="Theme.ImpressRemote.ActionBarMenuItem" parent="android:style/Widget.Holo.Light.ListView.DropDown">
<style name="Theme.ImpressRemote.ActionBarMenuItem" parent="Widget.Sherlock.Light.Spinner.DropDown.ActionBar">
<item name="android:background">@color/grey</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">16dp</item>
</style>
<style name="Theme.ImpressRemote" parent="android:style/Theme.Holo.Light">
<style name="Theme.ImpressRemote" parent="Theme.Sherlock.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item>
<item name="android:popupMenuStyle">@style/Theme.ImpressRemote.ActionBarMenu</item>
<item name="android:dropDownListViewStyle">@style/Theme.ImpressRemote.ActionBarMenuItem</item>
<item name="android:textAppearanceLargePopupMenu">@style/Theme.ImpressRemote.ActionBarMenuItem</item> <!-- <item name="android:actionBarWidgetTheme">@style/Theme.ImpressRemote.ActionBarWidget</item> -->
......
......@@ -28,6 +28,7 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.FrameLayout.LayoutParams;
import android.widget.TextView;
import android.widget.ToggleButton;
......@@ -293,8 +294,22 @@ public class PresentationActivity extends SherlockFragmentActivity {
}
mClockBar_clockButton.setChecked(!mTimerOn);
mCountdownBar.setY(mClockBar.getHeight());
mStopwatchBar.setY(mClockBar.getHeight());
FrameLayout.LayoutParams aParams = (LayoutParams) mCountdownBar
.getLayoutParams();
aParams.topMargin = mClockBar.getBottom();
// aParams.height = mClockBar.getHeight();
// aParams.bottomMargin = aParams.topMargin + aParams.height;
// aParams.leftMargin = 100;
mCountdownBar.setLayoutParams(aParams);
mCountdownBar.setPadding(0, mClockBar.getBottom(), 0, 0);
mStopwatchBar.setPadding(0, mClockBar.getBottom(), 0, 0);
// mCountdownBar.requestLayout();
// mOuterLayout.requestLayout();
// mOuterLayout.invalidate();
// aParams = (LayoutParams) mStopwatchBar.getLayoutParams();
// aParams.topMargin = mClockBar.getHeight();
// mOuterLayout.invalidate();
// mStopwatchBar.setY(mClockBar.getHeight());
boolean aIsCountdown = mCommunicationService.getSlideShow()
.getTimer().isCountdown();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment