diff --git a/res/drawable-hdpi/action_search.png b/res/drawable-hdpi/action_search.png deleted file mode 100755 index f12e005ebe835c1dd2f6ae324224c3ee296d2d68..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/action_search.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_btn_search.png b/res/drawable-hdpi/ic_btn_search.png new file mode 100644 index 0000000000000000000000000000000000000000..98e61a36fc149774f1f97a3a9850b75ac2384894 Binary files /dev/null and b/res/drawable-hdpi/ic_btn_search.png differ diff --git a/res/drawable-hdpi/ic_btn_speak_now.png b/res/drawable-hdpi/ic_btn_speak_now.png new file mode 100644 index 0000000000000000000000000000000000000000..c9281d378e930bb944369494d45852b694f446b4 Binary files /dev/null and b/res/drawable-hdpi/ic_btn_speak_now.png differ diff --git a/res/drawable-hdpi/ic_clear_search.png b/res/drawable-hdpi/ic_clear_search.png new file mode 100644 index 0000000000000000000000000000000000000000..90db01b5bcf1246d6a94e83930cac63c93a6cf83 Binary files /dev/null and b/res/drawable-hdpi/ic_clear_search.png differ diff --git a/res/drawable-mdpi/action_search.png b/res/drawable-mdpi/action_search.png deleted file mode 100755 index 587d9e0bf392fc928947f04293ba009f7fc77b29..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/action_search.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_btn_search.png b/res/drawable-mdpi/ic_btn_search.png new file mode 100644 index 0000000000000000000000000000000000000000..662f5de9151b042b80b10092cd46bda2ab492103 Binary files /dev/null and b/res/drawable-mdpi/ic_btn_search.png differ diff --git a/res/drawable-mdpi/ic_btn_speak_now.png b/res/drawable-mdpi/ic_btn_speak_now.png new file mode 100644 index 0000000000000000000000000000000000000000..0589be66a4b9e67297bcef844558fe53de21844f Binary files /dev/null and b/res/drawable-mdpi/ic_btn_speak_now.png differ diff --git a/res/drawable-mdpi/ic_clear_search.png b/res/drawable-mdpi/ic_clear_search.png new file mode 100644 index 0000000000000000000000000000000000000000..15b86cbb21eb3bfb82d36aa9ce750906297a9225 Binary files /dev/null and b/res/drawable-mdpi/ic_clear_search.png differ diff --git a/res/drawable-xhdpi/action_search.png b/res/drawable-xhdpi/action_search.png deleted file mode 100755 index 3549f84dd8f5e38665849b46e252bc34f29be027..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/action_search.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_btn_search.png b/res/drawable-xhdpi/ic_btn_search.png new file mode 100644 index 0000000000000000000000000000000000000000..a267c0a6114e76fe37f9b3ed48ed699681e2a402 Binary files /dev/null and b/res/drawable-xhdpi/ic_btn_search.png differ diff --git a/res/drawable-xhdpi/ic_btn_speak_now.png b/res/drawable-xhdpi/ic_btn_speak_now.png new file mode 100644 index 0000000000000000000000000000000000000000..f7f49224b7facf2d459743c1a84363a9a38a2828 Binary files /dev/null and b/res/drawable-xhdpi/ic_btn_speak_now.png differ diff --git a/res/drawable-xhdpi/ic_clear_search.png b/res/drawable-xhdpi/ic_clear_search.png new file mode 100644 index 0000000000000000000000000000000000000000..53cfbd311551eca5b37ddd9541d12d698ab05ab0 Binary files /dev/null and b/res/drawable-xhdpi/ic_clear_search.png differ diff --git a/res/drawable/ic_menu_close_clear_cancel.png b/res/drawable/ic_menu_close_clear_cancel.png deleted file mode 100644 index d743d752b1444755f0c4db7298a5e164378ec5fe..0000000000000000000000000000000000000000 Binary files a/res/drawable/ic_menu_close_clear_cancel.png and /dev/null differ diff --git a/res/layout/activity_sflphone_home.xml b/res/layout/activity_sflphone_home.xml index 43ee7107f9da4746f5dc85ca9d0913ad874623c1..1db2c458eb15e03d363e6c3157963dd540c7f0c6 100644 --- a/res/layout/activity_sflphone_home.xml +++ b/res/layout/activity_sflphone_home.xml @@ -120,7 +120,7 @@ as that of the covered work. android:layout_alignParentRight="true" android:layout_below="@+id/menu_top_shadow" android:background="@color/light" - android:src="@drawable/action_search" + android:src="@drawable/ic_btn_search" android:clickable="true" android:focusable="true" diff --git a/res/layout/clearable_edit_text.xml b/res/layout/clearable_edit_text.xml index 4915d9c1607ce05f54371d81ed7b1bbe5909a643..07d3de8654a10e460ce1eee9d0363d194f314c94 100644 --- a/res/layout/clearable_edit_text.xml +++ b/res/layout/clearable_edit_text.xml @@ -17,6 +17,6 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginRight="5dip" - android:background="@drawable/ic_menu_close_clear_cancel" /> + android:background="@drawable/ic_clear_search" /> </RelativeLayout> \ No newline at end of file diff --git a/src/com/savoirfairelinux/sflphone/fragments/MenuFragment.java b/src/com/savoirfairelinux/sflphone/fragments/MenuFragment.java index 10a8bce561518aeaa47c3f8dd5fa4f97c6af31e8..fafe6ac067271b9f260d985098593a56f8786713 100644 --- a/src/com/savoirfairelinux/sflphone/fragments/MenuFragment.java +++ b/src/com/savoirfairelinux/sflphone/fragments/MenuFragment.java @@ -52,6 +52,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.RadioButton; import android.widget.Spinner; +import android.widget.Toast; import com.savoirfairelinux.sflphone.R; import com.savoirfairelinux.sflphone.adapters.AccountSelectionAdapter; @@ -166,10 +167,21 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<ArrayList< @Override public void onItemClick(AdapterView<?> arg0, View arg1, int pos, long arg3) { - if (pos == 1 || pos == 2 || pos == 3) { + Toast.makeText(getActivity(), "pos "+pos, Toast.LENGTH_SHORT).show(); + switch(pos){ + case 1: Intent launchPreferencesIntent = new Intent().setClass(getActivity(), SFLPhonePreferenceActivity.class); getActivity().startActivityForResult(launchPreferencesIntent, SFLPhoneHomeActivity.REQUEST_CODE_PREFERENCES); + break; + case 2: + case 3: + break; + case 5: + case 6: + case 7: + break; } + } });