Feature android lib #1030
Merged
Feature android lib #1030
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@arthurbenemann I tested this, and it works great. Just awaiting your code review. |
…into feature_android_lib
…into feature_android_lib
…into feature_android_lib
…icationProvider` interface.
…into feature_android_lib
…into feature_android_lib Conflicts: Android/src/org/droidplanner/android/maps/providers/google_map/GoogleMapFragment.java
|
@ne0fhyk I'm not sure what you where trying to accomplish here, can you give more details? If we can avoid creating another library that would be good. |
|
@arthurbenemann the library project stores all the common resources used by the different android projects (wear, app): http://stackoverflow.com/a/24592107 The alternative would be to duplicate resources, and code for each project. |
…into feature_android_lib
…into feature_android_lib Conflicts: Android/project.properties Android/res/drawable-hdpi/ic_loiter.png Android/res/drawable-hdpi/ic_pause.png Android/res/drawable-mdpi/ic_loiter.png Android/res/drawable-mdpi/ic_pause.png Android/res/drawable-xhdpi/.DS_Store Android/res/drawable-xhdpi/ic_loiter.png Android/res/drawable-xhdpi/ic_pause.png Android/res/drawable/ic_action_quad.xml Android/res/drawable/ic_navigate.xml Android/src/org/droidplanner/android/maps/providers/google_map/GoogleMapFragment.java Android/src/org/droidplanner/android/notifications/EmergencyBeepNotificationProvider.java AndroidLib/res/drawable-hdpi/ic_action_quad_connected.png AndroidLib/res/drawable-hdpi/ic_action_quad_disconnect.png AndroidLib/res/drawable-hdpi/ic_loiter.png AndroidLib/res/drawable-land/mission_control_bg.xml AndroidLib/res/drawable-mdpi/ic_action_quad_connected.png AndroidLib/res/drawable-mdpi/ic_action_quad_disconnect.png AndroidLib/res/drawable-mdpi/ic_loiter.png AndroidLib/res/drawable-port/mission_control_bg.xml AndroidLib/res/drawable-sw540dp/mission_control_bg.xml AndroidLib/res/drawable-xhdpi/ic_action_quad_connected.png AndroidLib/res/drawable-xhdpi/ic_action_quad_disconnect.png AndroidLib/res/drawable-xhdpi/ic_loiter.png AndroidLib/res/drawable-xxhdpi/ic_action_quad_connected.png AndroidLib/res/drawable-xxhdpi/ic_action_quad_disconnect.png AndroidLib/res/drawable/flight_control_button_selector.xml AndroidLib/res/drawable/ic_action_quad.xml
…into feature_android_lib Conflicts: Android/project.properties Android/res/drawable-hdpi/ic_loiter.png Android/res/drawable-hdpi/ic_pause.png Android/res/drawable-mdpi/ic_loiter.png Android/res/drawable-mdpi/ic_pause.png Android/res/drawable-xhdpi/.DS_Store Android/res/drawable-xhdpi/ic_loiter.png Android/res/drawable-xhdpi/ic_pause.png Android/res/drawable/ic_action_quad.xml Android/res/drawable/ic_navigate.xml Android/src/org/droidplanner/android/maps/providers/google_map/GoogleMapFragment.java Android/src/org/droidplanner/android/notifications/EmergencyBeepNotificationProvider.java AndroidLib/res/drawable-hdpi/ic_action_quad_connected.png AndroidLib/res/drawable-hdpi/ic_action_quad_disconnect.png AndroidLib/res/drawable-hdpi/ic_loiter.png AndroidLib/res/drawable-land/mission_control_bg.xml AndroidLib/res/drawable-mdpi/ic_action_quad_connected.png AndroidLib/res/drawable-mdpi/ic_action_quad_disconnect.png AndroidLib/res/drawable-mdpi/ic_loiter.png AndroidLib/res/drawable-port/mission_control_bg.xml AndroidLib/res/drawable-sw540dp/mission_control_bg.xml AndroidLib/res/drawable-xhdpi/ic_action_quad_connected.png AndroidLib/res/drawable-xhdpi/ic_action_quad_disconnect.png AndroidLib/res/drawable-xhdpi/ic_loiter.png AndroidLib/res/drawable-xxhdpi/ic_action_quad_connected.png AndroidLib/res/drawable-xxhdpi/ic_action_quad_disconnect.png AndroidLib/res/drawable/flight_control_button_selector.xml AndroidLib/res/drawable/ic_action_quad.xml
…into feature_android_lib Conflicts: Android/src/org/droidplanner/android/activities/EditorActivity.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Extract the common android resources into an android library project.
This allows to avoid logic and resources reimplementation for android related projects (i.e: main app, wearables app).
Also serves as a base for decoupling of the android front end from the back end.
Setup, and tested in Android Studio, and Eclipse.