Fixed a task rabbit crash, updated some copy

pull/14/head
Sam Bosley 13 years ago
parent eaf5ca4e6f
commit fc78685bed

@ -261,10 +261,10 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
private void setupForDialogOrFullscreen() { private void setupForDialogOrFullscreen() {
isDialog = AndroidUtilities.isTabletSized(this); // isDialog = AndroidUtilities.isTabletSized(this);
if (isDialog) // if (isDialog)
setTheme(ThemeService.getDialogTheme()); // setTheme(ThemeService.getDialogTheme());
else // else
ThemeService.applyTheme(this); ThemeService.applyTheme(this);
} }

@ -263,9 +263,13 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
locationManager = (LocationManager) fragment.getActivity().getSystemService(Context.LOCATION_SERVICE); locationManager = (LocationManager) fragment.getActivity().getSystemService(Context.LOCATION_SERVICE);
currentLocation = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER); currentLocation = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
if (currentLocation == null) { if (currentLocation == null) {
try {
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this); locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
} catch (IllegalArgumentException e) {
// No gps
isEnabledForTRLocation = false;
} }
else { } else {
isEnabledForTRLocation = supportsCurrentLocation(currentLocation); isEnabledForTRLocation = supportsCurrentLocation(currentLocation);
} }
} }

@ -9,6 +9,9 @@
<!-- Tags label --> <!-- Tags label -->
<string name="TEA_tags_label">Lists</string> <string name="TEA_tags_label">Lists</string>
<!-- Tags label long version -->
<string name="TEA_tags_label_long">Put task on one or more lists</string>
<!-- Tags none --> <!-- Tags none -->
<string name="TEA_tags_none">None</string> <string name="TEA_tags_none">None</string>

@ -499,7 +499,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
tagsControlSet = new TagsControlSet(getActivity(), tagsControlSet = new TagsControlSet(getActivity(),
R.layout.control_set_tags, R.layout.control_set_tags,
R.layout.control_set_default_display, R.string.TEA_tags_label); R.layout.control_set_default_display, R.string.TEA_tags_label_long);
controls.add(tagsControlSet); controls.add(tagsControlSet);
controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref), controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref),
tagsControlSet); tagsControlSet);

Loading…
Cancel
Save