Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature return to me #1611

Merged
merged 17 commits into from
Sep 26, 2015
Merged

Feature return to me #1611

merged 17 commits into from
Sep 26, 2015

Conversation

m4gr3d
Copy link
Member

@m4gr3d m4gr3d commented Sep 26, 2015

m4gr3d added 16 commits September 20, 2015 18:13
@m4gr3d
Added flight timer to the telemetry info widget.
c5c1fe7
@m4gr3d
adding omitted flight timer drawable resources.
7fd8686
@m4gr3d
Merge branches 'feature_return_to_me' and 'release-3.2.0.beta.4' of g…
9dc7e1a 
…ithub.com:DroidPlanner/droidplanner into feature_return_to_me

Conflicts:
	Android/src/org/droidplanner/android/fragments/widget/MiniWidgetTelemetryInfo.kt
@m4gr3d
moved the geo info into their own widget.
a941903 
moved the flight timer into its own widget.
@m4gr3d
label and description update.
ace2151
@m4gr3d
updated gopro take photo /record video icons based on the gopro state.
6bdaa42
@m4gr3d
moved the action drawer on sliding drawer update to avoid occlusion.
eb308a9
@m4gr3d
disabled permanent notification by default.
117efe9
@m4gr3d
Added preference to trigger 'return to me'.
8e3d610
@m4gr3d
added logic to start/stop the return to me functionality.
d36cf05
@m4gr3d
Added app service to manage the notification handler.
bfc244d
@m4gr3d
Fixed issue with moving home location on map.
2b05736
@m4gr3d
preferences cleanup
93bf836
@m4gr3d
adding omitted drawable resources.
41fabdd
@m4gr3d
completed return to me ux.
9516be2
@m4gr3d
adding return to me drawable resources.
2c530e9
@m4gr3d m4gr3d mentioned this pull request Sep 26, 2015
Closed
@m4gr3d m4gr3d mentioned this pull request Sep 26, 2015
Closed
@m4gr3d
Copy link
Member Author

m4gr3d commented Sep 26, 2015

return_to_me_icon_press_screenshot

return_to_me_dialog_screenshot

m4gr3d added a commit that referenced this pull request Sep 26, 2015
@m4gr3d
Merge pull request #1611 from DroidPlanner/feature_return_to_me
98f8ca0 
Feature return to me
@m4gr3d m4gr3d merged commit 98f8ca0 into release-3.2.0.beta.4 Sep 26, 2015
@m4gr3d m4gr3d deleted the feature_return_to_me branch September 26, 2015 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@m4gr3d