diff options
author | Danesh M <daneshm90@gmail.com> | 2014-11-17 14:01:42 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-11-17 14:30:19 -0800 |
commit | cae8add2ba0664a93bbb45a8caa8c17d8597feb1 (patch) | |
tree | 1f26a1f5ad2cfac463fcfb5d8462df4bd965555a | |
parent | 4d1c59e8371729d8666d52d6f337eef0c515c104 (diff) | |
download | android_hardware_qcom_fm-cae8add2ba0664a93bbb45a8caa8c17d8597feb1.tar.gz android_hardware_qcom_fm-cae8add2ba0664a93bbb45a8caa8c17d8597feb1.tar.bz2 android_hardware_qcom_fm-cae8add2ba0664a93bbb45a8caa8c17d8597feb1.zip |
Fm : Restore seek arrows
Change-Id: I635da34903f9b21c43c167e78aaabf055462800e
30 files changed, 8 insertions, 36 deletions
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png Binary files differindex 857fb7a..8ac0c4e 100644 --- a/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png +++ b/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png Binary files differindex 438e392..8ded17a 100644 --- a/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png +++ b/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_left_selected.png b/fmapp2/res/drawable-hdpi/btn_arrow_left_selected.png Binary files differdeleted file mode 100644 index fab8ee4..0000000 --- a/fmapp2/res/drawable-hdpi/btn_arrow_left_selected.png +++ /dev/null diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png Binary files differindex 547e505..330bb9f 100644 --- a/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png +++ b/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png Binary files differindex 96eacae..f3206bf 100644 --- a/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png +++ b/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_right_selected.png b/fmapp2/res/drawable-hdpi/btn_arrow_right_selected.png Binary files differdeleted file mode 100644 index 67a86f5..0000000 --- a/fmapp2/res/drawable-hdpi/btn_arrow_right_selected.png +++ /dev/null diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png Binary files differindex da077e6..13fc36f 100644 --- a/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png +++ b/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png Binary files differindex b18c859..822151e 100644 --- a/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png +++ b/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_left_selected.png b/fmapp2/res/drawable-mdpi/btn_arrow_left_selected.png Binary files differdeleted file mode 100644 index aa5ebe4..0000000 --- a/fmapp2/res/drawable-mdpi/btn_arrow_left_selected.png +++ /dev/null diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png Binary files differindex 696f53a..b2d6cf7 100644 --- a/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png +++ b/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png Binary files differindex 069df33..d217663 100644 --- a/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png +++ b/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_right_selected.png b/fmapp2/res/drawable-mdpi/btn_arrow_right_selected.png Binary files differdeleted file mode 100644 index d7d797b..0000000 --- a/fmapp2/res/drawable-mdpi/btn_arrow_right_selected.png +++ /dev/null diff --git a/fmapp2/res/drawable-xhdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-xhdpi/btn_arrow_left_default.png Binary files differnew file mode 100644 index 0000000..7197506 --- /dev/null +++ b/fmapp2/res/drawable-xhdpi/btn_arrow_left_default.png diff --git a/fmapp2/res/drawable-xhdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-xhdpi/btn_arrow_left_press.png Binary files differnew file mode 100644 index 0000000..607547b --- /dev/null +++ b/fmapp2/res/drawable-xhdpi/btn_arrow_left_press.png diff --git a/fmapp2/res/drawable-xhdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-xhdpi/btn_arrow_right_default.png Binary files differnew file mode 100644 index 0000000..3d14eb3 --- /dev/null +++ b/fmapp2/res/drawable-xhdpi/btn_arrow_right_default.png diff --git a/fmapp2/res/drawable-xhdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-xhdpi/btn_arrow_right_press.png Binary files differnew file mode 100644 index 0000000..1b476da --- /dev/null +++ b/fmapp2/res/drawable-xhdpi/btn_arrow_right_press.png diff --git a/fmapp2/res/drawable-xxhdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-xxhdpi/btn_arrow_left_default.png Binary files differnew file mode 100644 index 0000000..a5048bc --- /dev/null +++ b/fmapp2/res/drawable-xxhdpi/btn_arrow_left_default.png diff --git a/fmapp2/res/drawable-xxhdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-xxhdpi/btn_arrow_left_press.png Binary files differnew file mode 100644 index 0000000..17992ea --- /dev/null +++ b/fmapp2/res/drawable-xxhdpi/btn_arrow_left_press.png diff --git a/fmapp2/res/drawable-xxhdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-xxhdpi/btn_arrow_right_default.png Binary files differnew file mode 100644 index 0000000..44162e8 --- /dev/null +++ b/fmapp2/res/drawable-xxhdpi/btn_arrow_right_default.png diff --git a/fmapp2/res/drawable-xxhdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-xxhdpi/btn_arrow_right_press.png Binary files differnew file mode 100644 index 0000000..a664e5d --- /dev/null +++ b/fmapp2/res/drawable-xxhdpi/btn_arrow_right_press.png diff --git a/fmapp2/res/drawable/btn_arrow_left.xml b/fmapp2/res/drawable/btn_arrow_left.xml index e64966c..ea850c4 100644 --- a/fmapp2/res/drawable/btn_arrow_left.xml +++ b/fmapp2/res/drawable/btn_arrow_left.xml @@ -31,9 +31,6 @@ <item android:state_pressed="true" android:drawable="@drawable/btn_arrow_left_press" /> - <item android:state_window_focused="true" android:state_focused="true" - android:drawable="@drawable/btn_arrow_left_selected" /> - <item android:drawable="@drawable/btn_arrow_left_default" /> diff --git a/fmapp2/res/drawable/btn_arrow_left_default.png b/fmapp2/res/drawable/btn_arrow_left_default.png Binary files differdeleted file mode 100644 index 2a35952..0000000 --- a/fmapp2/res/drawable/btn_arrow_left_default.png +++ /dev/null diff --git a/fmapp2/res/drawable/btn_arrow_left_press.png b/fmapp2/res/drawable/btn_arrow_left_press.png Binary files differdeleted file mode 100644 index 8b72f0a..0000000 --- a/fmapp2/res/drawable/btn_arrow_left_press.png +++ /dev/null diff --git a/fmapp2/res/drawable/btn_arrow_left_selected.png b/fmapp2/res/drawable/btn_arrow_left_selected.png Binary files differdeleted file mode 100644 index 6cd3c9f..0000000 --- a/fmapp2/res/drawable/btn_arrow_left_selected.png +++ /dev/null diff --git a/fmapp2/res/drawable/btn_arrow_right.xml b/fmapp2/res/drawable/btn_arrow_right.xml index e4ab6f9..11c8a3c 100644 --- a/fmapp2/res/drawable/btn_arrow_right.xml +++ b/fmapp2/res/drawable/btn_arrow_right.xml @@ -32,9 +32,6 @@ <item android:state_pressed="true" android:drawable="@drawable/btn_arrow_right_press" /> - <item android:state_window_focused="true" android:state_focused="true" - android:drawable="@drawable/btn_arrow_right_selected" /> - <item android:drawable="@drawable/btn_arrow_right_default" /> diff --git a/fmapp2/res/drawable/btn_arrow_right_default.png b/fmapp2/res/drawable/btn_arrow_right_default.png Binary files differdeleted file mode 100644 index ae6fd53..0000000 --- a/fmapp2/res/drawable/btn_arrow_right_default.png +++ /dev/null diff --git a/fmapp2/res/drawable/btn_arrow_right_press.png b/fmapp2/res/drawable/btn_arrow_right_press.png Binary files differdeleted file mode 100644 index a4ae45b..0000000 --- a/fmapp2/res/drawable/btn_arrow_right_press.png +++ /dev/null diff --git a/fmapp2/res/drawable/btn_arrow_right_selected.png b/fmapp2/res/drawable/btn_arrow_right_selected.png Binary files differdeleted file mode 100644 index 93bcc77..0000000 --- a/fmapp2/res/drawable/btn_arrow_right_selected.png +++ /dev/null diff --git a/fmapp2/res/layout/station_info.xml b/fmapp2/res/layout/station_info.xml index 404c6c8..4d75816 100644 --- a/fmapp2/res/layout/station_info.xml +++ b/fmapp2/res/layout/station_info.xml @@ -90,8 +90,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="15dp" + android:layout_centerVertical="true" android:layout_alignParentLeft="true" - android:visibility="gone" android:layout_alignWithParentIfMissing="true" android:src="@drawable/btn_arrow_left"/> @@ -101,8 +101,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingRight="15dp" + android:layout_centerVertical="true" android:layout_alignParentRight="true" - android:visibility="gone" android:layout_alignWithParentIfMissing="true" android:src="@drawable/btn_arrow_right"/> diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java index 892fbef..d054b86 100644 --- a/fmapp2/src/com/caf/fmradio/FMRadio.java +++ b/fmapp2/src/com/caf/fmradio/FMRadio.java @@ -343,13 +343,11 @@ public class FMRadio extends Activity mForwardButton = (ImageView)findViewById(R.id.btn_forward); if (mForwardButton != null) { mForwardButton.setOnClickListener(mForwardClickListener); - mForwardButton.setOnLongClickListener(mForwardLongClickListener); } mBackButton = (ImageView)findViewById(R.id.btn_back); if (mBackButton != null) { mBackButton.setOnClickListener(mBackClickListener); - mBackButton.setOnLongClickListener(mBackLongClickListener); } /* 6 Preset Buttons */ @@ -1419,37 +1417,17 @@ public class FMRadio extends Activity private View.OnClickListener mForwardClickListener = new View.OnClickListener() { public void onClick(View v) { - int frequency = FmSharedPreferences.getNextTuneFrequency(); - Log.d(LOGTAG, "Tune Up: to " + frequency); - tuneRadio(frequency); + SeekNextStation(); } }; private View.OnClickListener mBackClickListener = new View.OnClickListener() { public void onClick(View v) { - int frequency = FmSharedPreferences.getPrevTuneFrequency(); - Log.d(LOGTAG, "Tune Down: to " + frequency); - tuneRadio(frequency); + SeekPreviousStation(); } }; - private View.OnLongClickListener mForwardLongClickListener = - new View.OnLongClickListener() { - public boolean onLongClick(View view) { - SeekNextStation(); - return true; - } - }; - - private View.OnLongClickListener mBackLongClickListener = - new View.OnLongClickListener() { - public boolean onLongClick(View view) { - SeekPreviousStation(); - return true; - } - }; - private View.OnClickListener mPresetListClickListener = new View.OnClickListener() { public void onClick(View v) { @@ -1902,12 +1880,12 @@ public class FMRadio extends Activity } } if (mForwardButton != null) { - //mForwardButton.setVisibility(((bEnable == true) ? View.VISIBLE - // : View.INVISIBLE)); + mForwardButton.setVisibility(((bEnable == true) ? View.VISIBLE + : View.INVISIBLE)); } if (mBackButton != null) { - //mBackButton.setVisibility(((bEnable == true) ? View.VISIBLE - // : View.INVISIBLE)); + mBackButton.setVisibility(((bEnable == true) ? View.VISIBLE + : View.INVISIBLE)); } if (mTuneStationFrequencyTV != null) { mTuneStationFrequencyTV.setVisibility(((bEnable == true) ? View.VISIBLE |