Skip to content

Commit

Permalink
Imported app v2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
scaryghost committed Jan 26, 2015
1 parent 48fddfe commit ff7b33c
Show file tree
Hide file tree
Showing 41 changed files with 2,460 additions and 1,894 deletions.
5 changes: 2 additions & 3 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mbientlab.metawear.app"
android:versionCode="5"
android:versionName="2.3" >
android:versionCode="6"
android:versionName="2.4" >

<uses-sdk
android:minSdkVersion="18"
Expand Down Expand Up @@ -54,7 +54,6 @@
</activity>
<activity
android:name="com.mbientlab.metawear.app.ModuleDetailActivity"
android:label="@string/title_module_detail"
android:parentActivityName="com.mbientlab.metawear.app.ModuleListActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This app provides an example of how to use the MetaWear API. It uses the sample
[https://play.google.com/store/apps/details?id=no.nordicsemi.android.nrftoolbox&hl=en](https://play.google.com/store/apps/details?id=no.nordicsemi.android.nrftoolbox&hl=en)

### Version ###
Current version is: 2.3
Current version is: 2.4

### Build ###
The API was created with Android Developer Tools v22.6.2-1085508. It is targeted for Android 4.4.2 (API 19) SDK with Android 4.3 (API 18) as the minimum required SDK and requires a JDK compiler compliance level of 1.7. To build the project, you will need to download the MetaWear API and configure the example app to include the API in the build path. More information on configuring the build is available in the "Getting Started" guide, available on the MbientLab website: [https://mbientlab.com/docs/](https://mbientlab.com/docs/).
Expand Down
Binary file added res/drawable-hdpi/ic_media_stop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_media_stop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_media_stop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_media_stop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions res/drawable/button_selector.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/lightGray"
android:state_pressed="true" />
<item android:drawable="@color/lightGray"
android:state_focused="true" />
<item android:drawable="@android:color/transparent" />
</selector>
27 changes: 18 additions & 9 deletions res/layout/activity_feature_dfu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
The information contained herein is property of Nordic Semiconductor ASA.
Terms and conditions of usage are described in detail in NORDIC SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
Licensees are granted free, non-transferable use of the information. NO WARRANTY of ANY KIND is provided.
This heading must NOT be removed from the file.-->
This heading must NOT be removed from the file.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
Expand Down Expand Up @@ -120,7 +121,8 @@
</TableRow>
</TableLayout>

<LinearLayout
<RelativeLayout
android:id="@+id/RelativeLayout1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/feature_section_padding"
Expand All @@ -133,23 +135,29 @@
android:id="@+id/action_select_file"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:onClick="onSelectFileClicked"
android:text="@string/dfu_action_select_file" />

<Button
android:id="@+id/action_update_latest"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="onUpdateLatestClicked"
android:text="@string/dfu_action_update_latest" />
android:id="@+id/action_update_latest"
android:layout_below="@+id/action_select_file"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="onUpdateLatestClicked"
android:text="@string/dfu_action_update_latest" />

<ImageView
android:id="@+id/ImageView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_alignParentTop="true"
android:layout_toRightOf="@+id/action_select_file"
android:onClick="onSelectFileHelpClicked"
android:src="@drawable/ic_help" />
</LinearLayout>

</RelativeLayout>
</LinearLayout>

<!-- DFU section -->
Expand Down Expand Up @@ -203,4 +211,5 @@
android:visibility="invisible" />
</LinearLayout>
</LinearLayout>

</RelativeLayout>
Loading

0 comments on commit ff7b33c

Please sign in to comment.