diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2014-02-16 15:35:59 +0200 |
---|---|---|
committer | Matt Wagantall <mwagantall@cyngn.com> | 2016-02-19 14:07:43 -0800 |
commit | 755c03322743f28381c130402bbdc31771c26d31 (patch) | |
tree | 9591ab892db05536bdde1be64c429b69098a7466 /fmapp2/src | |
parent | deb38276d1bfcad79833d92a83ec4efbf62cd44a (diff) | |
download | android_hardware_qcom_fm-755c03322743f28381c130402bbdc31771c26d31.tar.gz android_hardware_qcom_fm-755c03322743f28381c130402bbdc31771c26d31.tar.bz2 android_hardware_qcom_fm-755c03322743f28381c130402bbdc31771c26d31.zip |
FM: Cleanup resources
* Remove unused layouts/drawables
* Remove unused strings
* Remove CAF chinese translations
* Improve strings
* Move debug strings/arrays to debug_strings.xml/debug_arrays.xml
* Move transmitter strings to transmit_strings.xml
Change-Id: I5b391b459aefa75a6c3edbc525d471a3bcefb2be
Diffstat (limited to 'fmapp2/src')
-rw-r--r-- | fmapp2/src/com/caf/fmradio/FMRadio.java | 18 | ||||
-rw-r--r-- | fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java | 4 | ||||
-rw-r--r-- | fmapp2/src/com/caf/fmradio/Settings.java | 14 | ||||
-rw-r--r-- | fmapp2/src/com/caf/fmradio/StationListActivity.java | 4 | ||||
-rw-r--r-- | fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java | 2 | ||||
-rw-r--r-- | fmapp2/src/com/caf/utils/FrequencyPickerDialog.java | 2 |
6 files changed, 20 insertions, 24 deletions
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java index e3f7230..19c4c3d 100644 --- a/fmapp2/src/com/caf/fmradio/FMRadio.java +++ b/fmapp2/src/com/caf/fmradio/FMRadio.java @@ -631,14 +631,12 @@ public class FMRadio extends Activity item = menu.add(0, MENU_RECORD_START, 0, R.string.menu_record_start) .setIcon(R.drawable.ic_menu_record); if (item != null) { - item.setVisible(true); - item.setEnabled((!recording) && radioOn); + item.setVisible((!recording) && radioOn); } item = menu.add(0, MENU_RECORD_STOP, 0, R.string.menu_record_stop) .setIcon(R.drawable.ic_menu_record); if (item != null) { - item.setVisible(true); - item.setEnabled(recording && radioOn); + item.setVisible(recording && radioOn); } } /* Settings can be active */ @@ -1312,7 +1310,7 @@ public class FMRadio extends Activity R.layout.alert_dialog_text_entry, null); dlgBuilder.setTitle(R.string.dialog_presetlist_rename_title); dlgBuilder.setView(textEntryView); - dlgBuilder.setPositiveButton(R.string.alert_dialog_ok, + dlgBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { //int curList = FmSharedPreferences.getCurrentListIndex(); @@ -1331,7 +1329,7 @@ public class FMRadio extends Activity removeDialog(DIALOG_PRESET_RENAME); } }); - dlgBuilder.setNegativeButton(R.string.alert_dialog_cancel, + dlgBuilder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { removeDialog(DIALOG_PRESET_RENAME); @@ -1345,7 +1343,7 @@ public class FMRadio extends Activity dlgBuilder.setIcon(R.drawable.alert_dialog_icon) .setTitle(R.string.fm_command_timeout_title); dlgBuilder.setMessage(R.string.fm_tune_timeout_msg); - dlgBuilder.setPositiveButton(R.string.alert_dialog_ok, + dlgBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -1364,7 +1362,7 @@ public class FMRadio extends Activity .setTitle(R.string.fm_command_failed_title); dlgBuilder.setMessage(R.string.fm_cmd_failed_msg); - dlgBuilder.setPositiveButton(R.string.alert_dialog_ok, + dlgBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -1382,7 +1380,7 @@ public class FMRadio extends Activity .setTitle(R.string.fm_command_failed_title); dlgBuilder.setMessage(R.string.fm_cmd_failed_msg_hdmi); - dlgBuilder.setPositiveButton(R.string.alert_dialog_ok, + dlgBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -1400,7 +1398,7 @@ public class FMRadio extends Activity .setTitle(R.string.fm_command_failed_title); dlgBuilder.setMessage(R.string.fm_cmd_failed_call_on); - dlgBuilder.setPositiveButton(R.string.alert_dialog_ok, + dlgBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { diff --git a/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java b/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java index 7ae8762..9222eea 100644 --- a/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java +++ b/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java @@ -652,7 +652,7 @@ public class FMTransmitterActivity extends Activity { R.string.presetlist_autoselect_title); dlgBuilder.setMessage(getString(R.string.fmtx_autoselect_name)); - dlgBuilder.setPositiveButton(R.string.alert_dialog_ok, + dlgBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { /* @@ -666,7 +666,7 @@ public class FMTransmitterActivity extends Activity { } }); - dlgBuilder.setNegativeButton(R.string.alert_dialog_cancel, + dlgBuilder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { removeDialog(DIALOG_PRESET_LIST_AUTO_SET); diff --git a/fmapp2/src/com/caf/fmradio/Settings.java b/fmapp2/src/com/caf/fmradio/Settings.java index de19f01..a03d0d9 100644 --- a/fmapp2/src/com/caf/fmradio/Settings.java +++ b/fmapp2/src/com/caf/fmradio/Settings.java @@ -119,7 +119,7 @@ public class Settings extends PreferenceActivity implements mBandPreference = new ListPreference(this); mBandPreference.setEntries(R.array.regional_band_entries); mBandPreference.setEntryValues(R.array.regional_band_values); - mBandPreference.setDialogTitle(R.string.sel_band_menu); + mBandPreference.setDialogTitle(R.string.regional_band); mBandPreference.setKey(REGIONAL_BAND_KEY); mBandPreference.setTitle(R.string.regional_band); index = FmSharedPreferences.getCountry(); @@ -134,7 +134,7 @@ public class Settings extends PreferenceActivity implements mChannelSpacingPref = new ListPreference(this); mChannelSpacingPref.setEntries(R.array.channel_spacing_entries); mChannelSpacingPref.setEntryValues(R.array.channel_spacing_val); - mChannelSpacingPref.setDialogTitle(R.string.sel_chanl_spacing); + mChannelSpacingPref.setDialogTitle(R.string.chanl_spacing); mChannelSpacingPref.setTitle(R.string.chanl_spacing); mChannelSpacingPref.setKey(CHAN_SPACING_KEY); @@ -180,7 +180,7 @@ public class Settings extends PreferenceActivity implements index = 1; } } - mAudioPreference.setDialogTitle(R.string.sel_audio_output); + mAudioPreference.setDialogTitle(R.string.aud_output_mode); mAudioPreference.setKey(AUDIO_OUTPUT_KEY); mAudioPreference.setTitle(R.string.aud_output_mode); @@ -193,8 +193,6 @@ public class Settings extends PreferenceActivity implements mAfPref = new CheckBoxPreference(this); mAfPref.setKey(AUTO_AF); mAfPref.setTitle(R.string.auto_select_af); - mAfPref.setSummaryOn(R.string.auto_select_af_enabled); - mAfPref.setSummaryOff(R.string.auto_select_af_disabled); boolean bAFAutoSwitch = FmSharedPreferences.getAutoAFSwitch(); Log.d(LOGTAG, "createPreferenceHierarchy: bAFAutoSwitch: " + bAFAutoSwitch); @@ -208,7 +206,7 @@ public class Settings extends PreferenceActivity implements mRecordDurPreference = new ListPreference(this); mRecordDurPreference.setEntries(R.array.record_durations_entries); mRecordDurPreference.setEntryValues(R.array.record_duration_values); - mRecordDurPreference.setDialogTitle(R.string.sel_rec_dur); + mRecordDurPreference.setDialogTitle(R.string.record_dur); mRecordDurPreference.setKey(RECORD_DURATION_KEY); mRecordDurPreference.setTitle(R.string.record_dur); nRecordDuration = FmSharedPreferences.getRecordDuration(); @@ -468,7 +466,7 @@ public class Settings extends PreferenceActivity implements R.drawable.alert_dialog_icon).setTitle( R.string.settings_revert_confirm_title).setMessage( R.string.settings_revert_confirm_msg).setPositiveButton( - R.string.alert_dialog_ok, + android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -478,7 +476,7 @@ public class Settings extends PreferenceActivity implements restoreSettingsDefault(); finish(); } - }).setNegativeButton(R.string.alert_dialog_cancel, + }).setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { diff --git a/fmapp2/src/com/caf/fmradio/StationListActivity.java b/fmapp2/src/com/caf/fmradio/StationListActivity.java index 46b59ad..a2f7c91 100644 --- a/fmapp2/src/com/caf/fmradio/StationListActivity.java +++ b/fmapp2/src/com/caf/fmradio/StationListActivity.java @@ -158,7 +158,7 @@ public class StationListActivity extends Activity implements menu.add(0, CONTEXT_MENU_RENAME, 0, getString(R.string.preset_rename)); menu.add(0, CONTEXT_MENU_DELETE, 0, getString(R.string.preset_delete)); mItemId = mi.position; - menu.setHeaderTitle(getString(R.string.station_name)+getNameFromId(mItemId)); + menu.setHeaderTitle(getString(R.string.station_name, getNameFromId(mItemId))); } @Override @@ -186,7 +186,7 @@ public class StationListActivity extends Activity implements load(); switch (id) { case DIALOG_RENAME_ID: - mRenameDialog.setTitle(getString(R.string.station_name)+getNameFromId(mItemId)); + mRenameDialog.setTitle(getString(R.string.station_name, getNameFromId(mItemId))); final EditText editText = (EditText) mRenameDialog .findViewById(R.id.name); editText.setText(getNameFromId(mItemId)); diff --git a/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java b/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java index aca5fba..4f7102b 100644 --- a/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java +++ b/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java @@ -100,7 +100,7 @@ OnFrequencyChangedListener { mCallBack = callback; setButton(context.getString(R.string.set), this); - setButton2(context.getString(R.string.cancel), (OnClickListener) null); + setButton2(context.getString(android.R.string.cancel), (OnClickListener) null); setIcon(R.drawable.alert_dialog_icon); LayoutInflater inflater = diff --git a/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java b/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java index be1c8b0..8cb9de6 100644 --- a/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java +++ b/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java @@ -100,7 +100,7 @@ OnFrequencyChangedListener { mCallBack = callback; setButton(context.getString(R.string.set), this); - setButton2(context.getString(R.string.cancel), (OnClickListener) null); + setButton2(context.getString(android.R.string.cancel), (OnClickListener) null); setIcon(R.drawable.alert_dialog_icon); LayoutInflater inflater = |