FM: Fix the issue with color of text in landscape mode
Default color of text in latest android is changed.
Color of text makes it to white.
CRs-Fixed: 703235
Change-Id: I0fcc0837eeef0a5006b44d99c1a1c045a07f808c
diff --git a/fmapp2/res/layout-800x480/fmtransmitter.xml b/fmapp2/res/layout-800x480/fmtransmitter.xml
index f12e808..4754780 100644
--- a/fmapp2/res/layout-800x480/fmtransmitter.xml
+++ b/fmapp2/res/layout-800x480/fmtransmitter.xml
@@ -54,6 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15dp"
+ android:textColor="@android:color/white"
android:layout_centerInParent="true"
android:layout_alignWithParentIfMissing="true"
android:text="@string/transmit_msg_string"/>
@@ -86,7 +87,8 @@
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/frequency_string"/>
+ android:text="@string/frequency_string"
+ android:textColor="@android:color/white"/>
<ImageView android:id="@+id/btn_forward"
android:clickable="true"
@@ -111,6 +113,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20dp"
+ android:textColor="@android:color/white"
android:singleLine="true"
android:textStyle="bold"
android:paddingLeft="2dp"
diff --git a/fmapp2/res/layout-land-finger-800x480/fmradio.xml b/fmapp2/res/layout-land-finger-800x480/fmradio.xml
index 4a4519a..4075e8d 100644
--- a/fmapp2/res/layout-land-finger-800x480/fmradio.xml
+++ b/fmapp2/res/layout-land-finger-800x480/fmradio.xml
@@ -56,6 +56,7 @@
android:layout_toRightOf="@+id/btn_onoff"
android:textSize="14sp"
android:textStyle="bold"
+ android:textColor="@android:color/white"
android:clickable="true"
android:focusable="true"
android:visibility="invisible"
@@ -69,6 +70,7 @@
android:layout_toRightOf="@+id/record_msg_tv"
android:layout_toLeftOf="@+id/btn_silent"
android:textSize="16sp"
+ android:textColor="@android:color/white"
android:singleLine="true"
android:textStyle="bold"
android:text="@string/prog_service_string"/>
diff --git a/fmapp2/res/layout-land-finger-800x480/station_info.xml b/fmapp2/res/layout-land-finger-800x480/station_info.xml
index 3f44573..c9b787b 100644
--- a/fmapp2/res/layout-land-finger-800x480/station_info.xml
+++ b/fmapp2/res/layout-land-finger-800x480/station_info.xml
@@ -52,6 +52,7 @@
android:layout_height="wrap_content"
android:drawableLeft="@drawable/count_down"
android:textSize="14sp"
+ android:textColor="@android:color/white"
android:layout_marginLeft="25dp"
android:textStyle="bold"
android:visibility="invisible"
@@ -64,6 +65,7 @@
android:textSize="15sp"
android:singleLine="true"
android:textStyle="bold"
+ android:textColor="@android:color/white"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:layout_toLeftOf="@+id/sleep_msg_tv"
@@ -80,6 +82,7 @@
android:layout_alignParentRight="true"
android:layout_alignBaseline="@id/signal_level"
android:textSize="13sp"
+ android:textColor="@android:color/white"
android:text="@string/default_audio"/>
</RelativeLayout>
@@ -97,6 +100,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
+ android:textColor="@android:color/white"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:paddingLeft="16dp"
@@ -107,6 +111,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="15sp"
+ android:textColor="@android:color/white"
android:singleLine="true"
android:textStyle="bold"
android:layout_centerInParent="true"
@@ -117,6 +122,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
+ android:textColor="@android:color/white"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:paddingRight="16dp"
@@ -138,6 +144,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="25dp"
+ android:textColor="@android:color/white"
android:gravity="center"
android:clickable="true"
android:focusable="true"
diff --git a/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java b/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java
index 9798e3e..9fc2d53 100644
--- a/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java
+++ b/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java
@@ -39,6 +39,7 @@
import android.content.IntentFilter;
import android.content.BroadcastReceiver;
import android.content.SharedPreferences;
+import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
@@ -916,6 +917,11 @@
if(mRadioTextScroller != null) {
mRadioTextScroller.startScroll();
}
+ for (int nButton = 0; nButton < MAX_PRESETS; nButton++) {
+ if (mPresetButtons[nButton] != null) {
+ mPresetButtons[nButton].setTextColor(Color.WHITE);
+ }
+ }
}else {
if(mTuneStationFrequencyTV != null) {
mTuneStationFrequencyTV.setOnLongClickListener(null);
@@ -923,6 +929,11 @@
if(mRadioTextScroller != null) {
mRadioTextScroller.stopScroll();
}
+ for (int nButton = 0; nButton < MAX_PRESETS; nButton++) {
+ if (mPresetButtons[nButton] != null) {
+ mPresetButtons[nButton].setTextColor(Color.BLACK);
+ }
+ }
}
if(mForwardButton != null) {