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() {
isDialog = AndroidUtilities.isTabletSized(this);
if (isDialog)
setTheme(ThemeService.getDialogTheme());
else
// isDialog = AndroidUtilities.isTabletSized(this);
// if (isDialog)
// setTheme(ThemeService.getDialogTheme());
// else
ThemeService.applyTheme(this);
}
@ -410,13 +410,13 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
actionBar.setCustomView(R.layout.task_rabbit_header_view);
View customView = actionBar.getCustomView();
menuNav = customView.findViewById(R.id.menu_nav);
menuNavDisclosure = (ImageView) customView.findViewById(R.id.menu_disclosure_arrow);
View customView = actionBar.getCustomView();
menuNav = customView.findViewById(R.id.menu_nav);
menuNavDisclosure = (ImageView) customView.findViewById(R.id.menu_disclosure_arrow);
menuTitle = (TextView) customView.findViewById(R.id.task_rabbit_title);
menuNav.setOnClickListener(menuClickListener);
createMenuPopover();
menuTitle = (TextView) customView.findViewById(R.id.task_rabbit_title);
menuNav.setOnClickListener(menuClickListener);
createMenuPopover();
}

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

@ -9,6 +9,9 @@
<!-- Tags label -->
<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 -->
<string name="TEA_tags_none">None</string>

@ -499,7 +499,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
tagsControlSet = new TagsControlSet(getActivity(),
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);
controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref),
tagsControlSet);

Loading…
Cancel
Save