Revision 28
conflicts resolvidos??????
Files
- added
- modified
- copied
- renamed
- deleted
- trunk
- StepNCount
- .gitignore
- .idea
- StepNCount
- .gitignore
- .idea
- compiler.xml
- deploymentTargetDropDown.xml
- gradle.xml (diff)
- misc.xml (diff)
- workspace.xml
- SDK_VitalJacket_Android_ver1007
- Android
- BioLibTest.apk
- Library
- biolib.sdk.jar
- javadoc @BioLib 1.0.07
- Bio
- allclasses-frame.html
- allclasses-noframe.html
- constant-values.html
- deprecated-list.html
- help-doc.html
- index-files
- index-1.html
- index-10.html
- index-11.html
- index-12.html
- index-13.html
- index-14.html
- index-15.html
- index-2.html
- index-3.html
- index-4.html
- index-5.html
- index-6.html
- index-7.html
- index-8.html
- index-9.html
- index.html
- overview-tree.html
- package-list
- resources
- background.gif
- tab.gif
- titlebar.gif
- titlebar_end.gif
- stylesheet.css
- Sdk Android Biolib library v1.0.07.pdf
- Source Code.zip
- sdk_attention.txt
- Android
- app
- .gitignore
- build
- generated
- intermediates
- annotation_processor_list
- apk
- apk_ide_redirect_file
- app_metadata
- compatible_screen_manifest
- compile_and_runtime_not_namespaced_r_class_jar
- data_binding_base_class_log_artifact
- data_binding_layout_info_type_merge
- data_binding_layout_info_type_package
- desugar_graph
- debug
- out
- currentProject
- dirs_bucket_0
- dirs_bucket_1
- dirs_bucket_2
- dirs_bucket_3
- dirs_bucket_4
- dirs_bucket_5
- jar_9d2d2d00d87310ecab72ef9ea6fd35e7ebb76f76fb25e4b9b119843f7fea4114_bucket_0
- jar_9d2d2d00d87310ecab72ef9ea6fd35e7ebb76f76fb25e4b9b119843f7fea4114_bucket_1
- jar_9d2d2d00d87310ecab72ef9ea6fd35e7ebb76f76fb25e4b9b119843f7fea4114_bucket_2
- jar_9d2d2d00d87310ecab72ef9ea6fd35e7ebb76f76fb25e4b9b119843f7fea4114_bucket_3
- jar_9d2d2d00d87310ecab72ef9ea6fd35e7ebb76f76fb25e4b9b119843f7fea4114_bucket_4
- jar_9d2d2d00d87310ecab72ef9ea6fd35e7ebb76f76fb25e4b9b119843f7fea4114_bucket_5
- currentProject
- out
- debug
- dex
- dex_archive_input_jar_hashes
- dex_number_of_buckets_file
- external_file_lib_dex_archives
- incremental
- dataBindingGenBaseClassesDebug
- debug
- debug-mergeJavaRes
- merge-state
- zip-cache
- 0x46elSFEf4i8b9jnYRqVyveqn4=
- 2ylDluj12PAAf5kUccCV+u+TA1E=
- 4sL+6+Yt1Z27WPFCvFoBuPXHln0=
- 5AatOFJIJrP0x85aEgjD4_kH3ew=
- 5MMbWD6iZJXTf9IHeVQ+rqRTzEI=
- 6gBaB1wO66uTl5LXFLNj8hR3+_c=
- 7bt6gM+hL5YrFoAzgVXHwQa0xsY=
- 8ifT9rLNHwKmNzyLNSTIb0_dnBI=
- 95bJlaBshDeJp5CuMpmFgOr1HYE=
- 9BxDUPO1TLBYMOQSE1uU+Ccu8EA=
- 9KPwjxEorvFPOZJzAHgWD7vOn6o=
- BVqFzpvPxC0f9BaEXq7lLy0NgWw=
- Bd4AK5OZ8c1dXMBpkn0DcTxYGXw=
- BwnDkAJkNZSXwJ_TjRX9WEgHbhg=
- CZdkHoWsferIlXuKujuqWzJ3JKQ=
- DOOWKzjPTkzNgZ1O7Dea4y+vS8s=
- ECvsALfULBQ0QOnfFLJocWu7E6M=
- G3XtfpuO9vWWhPI5jpXvEPTqZ3g=
- GGJy2FdzgtpOrJIDD84CgR94yjM=
- GWWonYDexonA0PS2SRKEIfd2I4A=
- GZ8n0ILGlppH_lfr7zTmGY6k9_k=
- GhgnW_ti8tua4C9IIGpPyUc+tao=
- Gt8KDLJowdvU4BT5agdbySC18bc=
- HNbfrxuG1w10SjrGvcDB1FxIQj4=
- Hl3X7wp7+IV6zW66CJkMeU3drmo=
- JSCwW+mlpzddkoLBD09+K_rP+MA=
- JWaKtUyVdleRCuTc2KZl38f9Cvg=
- MZb7LTRGQnKW5uzSlelebkZ_mcs=
- MyEbCDwh592PbKN3DGDRn1JUqzw=
- N2ikmBfLkXKjvj8RsUl6LjKJSW0=
- ODrZzx0rtBPEgbvcU04r2u3VO_o=
- QGcgbfFi_NFMv+eu17tUcvhCPD8=
- Q_oUxJJlIqR3ZaJkv9JE0Nzhxc8=
- QxgpfFKeE+lGBiCWe+T9lfvUWu8=
- S14T0dnpzfSe2NWQ1ozyy7lW3Po=
- V2Lkje3n4MaWZQDp8DO+t9viWPg=
- VJYVGpD253qoy5bJxdaGRqZIghs=
- Vt100leajWPGbukvaLg8HeEvugg=
- WmK1c8t9uVudfHA9As4xNtmwyn8=
- X6N8BHQrbfpoTmj1iiVvxj7kx9Q=
- XhKxwZtisZ3IuJRtcO7FULC9NvY=
- XtJyphLDtifdLFX7QZOVa0hnZLs=
- _o57uL09ZuDGNkXRjDwMwxL7EhY=
- bHaBH8+ZW13MpuCBvxCTurtVbsU=
- bQ9MczqytED1upPNvRsZMeVn6gQ=
- c1Q3KraSyCOurqY63xAFZYA3xdU=
- dFyZ9d8ycMJQUxzJwVkU8_qY7Ks=
- dtPpVHyMdkSRi9s3iSoXAFWQnA8=
- dxgC4pWbpdvXlPPlKcSUFPYypmc=
- eL7PQ6yuuvIJlVqixQbhImElfuM=
- gmVOtnkmryzrh8jokZWOXN69+eA=
- hIOYQISX0zYcIB+s4a2wF7FuyEk=
- ioG7hdp1g0i03DCiFzPAhzEB9NY=
- jC69xsHLb8IFGUElAH6L_gvXhgk=
- jJcl3Ueuxn_IBVC70Tpu8SBJAJg=
- k+67aI+4dEv4JwGwERIZqZOj1as=
- k3T0P+RcpF0KDGlYSC9EADQycCY=
- kRpQ_jdbogTS9sd+SGkwgvf_AVk=
- kfM+d0r4C9JW49sIbCUdbLqH31k=
- ngWfe6GvIufNR7s9vAOpBPCen4s=
- o1YUaIWxYYNgEmaP7Jnt7Q81u8I=
- oL5HAb6PeOo0MAqNaxEwehiWYVk=
- oiTlZXukkU8m7LR0YGOJga1tbqU=
- oqVZ3bvG71wn0Io8lc8zLUpFcSY=
- p8kC31K690h9kEgN1x3b43t5ZcM=
- pJrYK9wHY8tLsUDyHDjQPxCxsQw=
- qD960isQhvTGz6MIshVufyQDSQc=
- qri5Hbe+Hv0xd8dGOQ5s5II67ew=
- rCEV1WL_K2sUfp0ONRT2tPdxPrk=
- slO0GTIBIeEyLUroi1bA9xQZK5U=
- srr+Xi7zFhorsI7Qv8WuViZ3snY=
- u1W7zOpzwZ5EPsMyyVgKMnjWhJ4=
- u6TtNzByEsYjfdLtUOAnNHLyPFA=
- uruiE0W73WnFQ8b9IxTVWwWcNXk=
- uuxuZINRXH+tFls++veSa0x1qZ0=
- wUNDS52C2ipuXZXcY7GwhxSD+g8=
- xRhR1TK1GDIEDpVSFE21lDAzwMs=
- xgopuELpG6o5lHGhtI8JSHb4HN0=
- z8SVCrNpsh28QAQxgDCodoCuUKA=
- mergeDebugAssets
- mergeDebugJniLibFolders
- mergeDebugShaders
- packageDebug
- processDebugResources
- javac
- local_only_symbol_list
- manifest_merge_blame_file
- merged_java_res
- merged_manifest
- merged_manifests
- merged_res
- debug
- drawable-v24_ic_launcher_foreground.xml.flat
- drawable_cal.png.flat
- drawable_calicon.xml.flat
- drawable_dist_icon.png.flat
- drawable_distanceicon.xml.flat
- drawable_fade_red.xml.flat
- drawable_footstepsicon.png.flat
- drawable_ic_launcher_background.xml.flat
- drawable_progressbar.xml.flat
- drawable_steps_icon.png.flat
- drawable_stepsicon.xml.flat
- drawable_ticon.png.flat
- drawable_timeicon.xml.flat
- layout-v31_activity_goals.xml.flat
- layout-v31_main.xml.flat
- layout-v31_simplerow.xml.flat
- layout_activity_bluetooth.xml.flat
- layout_activity_config.xml.flat
- layout_activity_connect.xml.flat
- layout_activity_goals.xml.flat
- layout_activity_main.xml.flat
- layout_search.xml.flat
- menu_activity_search_device.xml.flat
- mipmap-anydpi-v26_ic_launcher.xml.flat
- mipmap-anydpi-v26_ic_launcher_round.xml.flat
- mipmap-hdpi_ic_launcher.webp.flat
- mipmap-hdpi_ic_launcher_round.webp.flat
- mipmap-mdpi_ic_launcher.webp.flat
- mipmap-mdpi_ic_launcher_round.webp.flat
- mipmap-xhdpi_ic_launcher.webp.flat
- mipmap-xhdpi_ic_launcher_round.webp.flat
- mipmap-xxhdpi_ic_launcher.webp.flat
- mipmap-xxhdpi_ic_launcher_round.webp.flat
- mipmap-xxxhdpi_ic_launcher.webp.flat
- mipmap-xxxhdpi_ic_launcher_round.webp.flat
- navigation_nav_graph.xml.flat
- values-af_values-af.arsc.flat
- values-am_values-am.arsc.flat
- values-ar_values-ar.arsc.flat
- values-as_values-as.arsc.flat
- values-az_values-az.arsc.flat
- values-b+es+419_values-b+es+419.arsc.flat
- values-b+sr+Latn_values-b+sr+Latn.arsc.flat
- values-be_values-be.arsc.flat
- values-bg_values-bg.arsc.flat
- values-bn_values-bn.arsc.flat
- values-bs_values-bs.arsc.flat
- values-ca_values-ca.arsc.flat
- values-cs_values-cs.arsc.flat
- values-da_values-da.arsc.flat
- values-de_values-de.arsc.flat
- values-el_values-el.arsc.flat
- values-en-rAU_values-en-rAU.arsc.flat
- values-en-rCA_values-en-rCA.arsc.flat
- values-en-rGB_values-en-rGB.arsc.flat
- values-en-rIN_values-en-rIN.arsc.flat
- values-en-rXC_values-en-rXC.arsc.flat
- values-es-rUS_values-es-rUS.arsc.flat
- values-es_values-es.arsc.flat
- values-et_values-et.arsc.flat
- values-eu_values-eu.arsc.flat
- values-fa_values-fa.arsc.flat
- values-fi_values-fi.arsc.flat
- values-fr-rCA_values-fr-rCA.arsc.flat
- values-fr_values-fr.arsc.flat
- values-gl_values-gl.arsc.flat
- values-gu_values-gu.arsc.flat
- values-h320dp-port-v13_values-h320dp-port-v13.arsc.flat
- values-h360dp-land-v13_values-h360dp-land-v13.arsc.flat
- values-h480dp-land-v13_values-h480dp-land-v13.arsc.flat
- values-h550dp-port-v13_values-h550dp-port-v13.arsc.flat
- values-h720dp-v13_values-h720dp-v13.arsc.flat
- values-hdpi-v4_values-hdpi-v4.arsc.flat
- values-hi_values-hi.arsc.flat
- values-hr_values-hr.arsc.flat
- values-hu_values-hu.arsc.flat
- values-hy_values-hy.arsc.flat
- values-in_values-in.arsc.flat
- values-is_values-is.arsc.flat
- values-it_values-it.arsc.flat
- values-iw_values-iw.arsc.flat
- values-ja_values-ja.arsc.flat
- values-ka_values-ka.arsc.flat
- values-kk_values-kk.arsc.flat
- values-km_values-km.arsc.flat
- values-kn_values-kn.arsc.flat
- values-ko_values-ko.arsc.flat
- values-ky_values-ky.arsc.flat
- values-land_values-land.arsc.flat
- values-large-v4_values-large-v4.arsc.flat
- values-ldltr-v21_values-ldltr-v21.arsc.flat
- values-ldrtl-v17_values-ldrtl-v17.arsc.flat
- values-lo_values-lo.arsc.flat
- values-lt_values-lt.arsc.flat
- values-lv_values-lv.arsc.flat
- values-mk_values-mk.arsc.flat
- values-ml_values-ml.arsc.flat
- values-mn_values-mn.arsc.flat
- values-mr_values-mr.arsc.flat
- values-ms_values-ms.arsc.flat
- values-my_values-my.arsc.flat
- values-nb_values-nb.arsc.flat
- values-ne_values-ne.arsc.flat
- values-night-v8_values-night-v8.arsc.flat
- values-nl_values-nl.arsc.flat
- values-or_values-or.arsc.flat
- values-pa_values-pa.arsc.flat
- values-pl_values-pl.arsc.flat
- values-port_values-port.arsc.flat
- values-pt-rBR_values-pt-rBR.arsc.flat
- values-pt-rPT_values-pt-rPT.arsc.flat
- values-pt_values-pt.arsc.flat
- values-ro_values-ro.arsc.flat
- values-ru_values-ru.arsc.flat
- values-si_values-si.arsc.flat
- values-sk_values-sk.arsc.flat
- values-sl_values-sl.arsc.flat
- values-small-v4_values-small-v4.arsc.flat
- values-sq_values-sq.arsc.flat
- values-sr_values-sr.arsc.flat
- values-sv_values-sv.arsc.flat
- values-sw600dp-v13_values-sw600dp-v13.arsc.flat
- values-sw_values-sw.arsc.flat
- values-ta_values-ta.arsc.flat
- values-te_values-te.arsc.flat
- values-th_values-th.arsc.flat
- values-tl_values-tl.arsc.flat
- values-tr_values-tr.arsc.flat
- values-uk_values-uk.arsc.flat
- values-ur_values-ur.arsc.flat
- values-uz_values-uz.arsc.flat
- values-v16_values-v16.arsc.flat
- values-v17_values-v17.arsc.flat
- values-v18_values-v18.arsc.flat
- values-v21_values-v21.arsc.flat
- values-v22_values-v22.arsc.flat
- values-v23_values-v23.arsc.flat
- values-v24_values-v24.arsc.flat
- values-v25_values-v25.arsc.flat
- values-v26_values-v26.arsc.flat
- values-v28_values-v28.arsc.flat
- values-v31_values-v31.arsc.flat
- values-vi_values-vi.arsc.flat
- values-w1240dp-v13_values-w1240dp-v13.arsc.flat
- values-w320dp-land-v13_values-w320dp-land-v13.arsc.flat
- values-w360dp-port-v13_values-w360dp-port-v13.arsc.flat
- values-w480dp-port-v13_values-w480dp-port-v13.arsc.flat
- values-w600dp-land-v13_values-w600dp-land-v13.arsc.flat
- values-w600dp-v13_values-w600dp-v13.arsc.flat
- values-watch-v20_values-watch-v20.arsc.flat
- values-watch-v21_values-watch-v21.arsc.flat
- values-xlarge-v4_values-xlarge-v4.arsc.flat
- values-zh-rCN_values-zh-rCN.arsc.flat
- values-zh-rHK_values-zh-rHK.arsc.flat
- values-zh-rTW_values-zh-rTW.arsc.flat
- values-zu_values-zu.arsc.flat
- values_values.arsc.flat
- xml_backup_rules.xml.flat
- xml_data_extraction_rules.xml.flat
- debug
- merged_res_blame_folder
- debug
- out
- multi-v2
- debug.json
- values-af.json
- values-am.json
- values-ar.json
- values-as.json
- values-az.json
- values-b+es+419.json
- values-b+sr+Latn.json
- values-be.json
- values-bg.json
- values-bn.json
- values-bs.json
- values-ca.json
- values-cs.json
- values-da.json
- values-de.json
- values-el.json
- values-en-rAU.json
- values-en-rCA.json
- values-en-rGB.json
- values-en-rIN.json
- values-en-rXC.json
- values-es-rUS.json
- values-es.json
- values-et.json
- values-eu.json
- values-fa.json
- values-fi.json
- values-fr-rCA.json
- values-fr.json
- values-gl.json
- values-gu.json
- values-h320dp-port-v13.json
- values-h360dp-land-v13.json
- values-h480dp-land-v13.json
- values-h550dp-port-v13.json
- values-h720dp-v13.json
- values-hdpi-v4.json
- values-hi.json
- values-hr.json
- values-hu.json
- values-hy.json
- values-in.json
- values-is.json
- values-it.json
- values-iw.json
- values-ja.json
- values-ka.json
- values-kk.json
- values-km.json
- values-kn.json
- values-ko.json
- values-ky.json
- values-land.json
- values-large-v4.json
- values-ldltr-v21.json
- values-ldrtl-v17.json
- values-lo.json
- values-lt.json
- values-lv.json
- values-mk.json
- values-ml.json
- values-mn.json
- values-mr.json
- values-ms.json
- values-my.json
- values-nb.json
- values-ne.json
- values-night-v8.json
- values-nl.json
- values-or.json
- values-pa.json
- values-pl.json
- values-port.json
- values-pt-rBR.json
- values-pt-rPT.json
- values-pt.json
- values-ro.json
- values-ru.json
- values-si.json
- values-sk.json
- values-sl.json
- values-small-v4.json
- values-sq.json
- values-sr.json
- values-sv.json
- values-sw.json
- values-sw600dp-v13.json
- values-ta.json
- values-te.json
- values-th.json
- values-tl.json
- values-tr.json
- values-uk.json
- values-ur.json
- values-uz.json
- values-v16.json
- values-v17.json
- values-v18.json
- values-v21.json
- values-v22.json
- values-v23.json
- values-v24.json
- values-v25.json
- values-v26.json
- values-v28.json
- values-v31.json
- values-vi.json
- values-w1240dp-v13.json
- values-w320dp-land-v13.json
- values-w360dp-port-v13.json
- values-w480dp-port-v13.json
- values-w600dp-land-v13.json
- values-w600dp-v13.json
- values-watch-v20.json
- values-watch-v21.json
- values-xlarge-v4.json
- values-zh-rCN.json
- values-zh-rHK.json
- values-zh-rTW.json
- values-zu.json
- values.json
- single
- multi-v2
- out
- debug
- navigation_json
- packaged_manifests
- packaged_res
- processed_res
- project_dex_archive
- debug
- out
- 19d5b80ccfd52f3db5c1d54ea572af3a0f85ff50b0b270a5d0585fb970159af0_0.jar
- 19d5b80ccfd52f3db5c1d54ea572af3a0f85ff50b0b270a5d0585fb970159af0_1.jar
- 19d5b80ccfd52f3db5c1d54ea572af3a0f85ff50b0b270a5d0585fb970159af0_2.jar
- 19d5b80ccfd52f3db5c1d54ea572af3a0f85ff50b0b270a5d0585fb970159af0_3.jar
- 19d5b80ccfd52f3db5c1d54ea572af3a0f85ff50b0b270a5d0585fb970159af0_4.jar
- 19d5b80ccfd52f3db5c1d54ea572af3a0f85ff50b0b270a5d0585fb970159af0_5.jar
- com
- out
- debug
- runtime_symbol_list
- signing_config_versions
- source_set_path_map
- stable_resource_ids_file
- symbol_list_with_package_name
- variant_model
- outputs
- tmp
- build.gradle
- libs
- biolib.sdk.jar
- proguard-rules.pro
- src
- androidTest
- java
- com
- example
- stepncount
- ExampleInstrumentedTest.java
- stepncount
- example
- com
- java
- main
- AndroidManifest.xml
- java
- com
- example
- stepncount
- Bluetooth.java
- ConfigActivity.java
- GoalsActivity.java
- MainActivity.java
- stepncount
- example
- com
- res
- drawable
- cal.png
- calicon.xml
- dist_icon.png
- distanceicon.xml
- fade_red.xml
- footstepsicon.png
- ic_launcher_background.xml
- progressbar.xml
- steps_icon.png
- stepsicon.xml
- ticon.png
- timeicon.xml
- drawable-v24
- ic_launcher_foreground.xml
- layout
- activity_bluetooth.xml
- activity_config.xml
- activity_connect.xml
- activity_goals.xml
- activity_main.xml
- search.xml
- layout-v31
- activity_goals.xml
- main.xml
- simplerow.xml
- menu
- activity_search_device.xml
- mipmap-anydpi-v26
- ic_launcher.xml
- ic_launcher_round.xml
- mipmap-hdpi
- ic_launcher.webp
- ic_launcher_round.webp
- mipmap-mdpi
- ic_launcher.webp
- ic_launcher_round.webp
- mipmap-xhdpi
- ic_launcher.webp
- ic_launcher_round.webp
- mipmap-xxhdpi
- ic_launcher.webp
- ic_launcher_round.webp
- mipmap-xxxhdpi
- ic_launcher.webp
- ic_launcher_round.webp
- navigation
- nav_graph.xml
- values
- colors.xml
- dimens.xml
- strings.xml
- themes.xml
- values-land
- dimens.xml
- values-night
- themes.xml
- values-w1240dp
- dimens.xml
- values-w600dp
- dimens.xml
- xml
- backup_rules.xml
- data_extraction_rules.xml
- drawable
- test
- java
- com
- example
- stepncount
- ExampleUnitTest.java
- stepncount
- example
- com
- java
- androidTest
- build.gradle
- gradle
- wrapper
- gradle-wrapper.jar
- gradle-wrapper.properties
- wrapper
- gradle.properties
- gradlew
- gradlew.bat
- settings.gradle
- app
- .gitignore
- build.gradle
- libs
- proguard-rules.pro
- src
- main
- AndroidManifest.xml
- java
- res
- drawable
- age_icon.png
- ageicon.xml
- app_icon_your_company.png
- cal.png
- calicon.xml
- default_background.xml
- dist_icon.png
- distanceicon.xml
- distanceicon2.xml
- fade_blue.xml
- fade_green.xml
- fade_red.xml
- footstepsicon.png
- gender_icon.xml
- gendericon.png
- goals_icon.png
- goalsicon.xml
- goalsicon2.xml
- graph_icon.png
- graph_icon2.png
- graphicon.xml
- height_icon.xml
- heighticon.png
- ic_launcher_background.xml
- minus.png
- movie.png
- plus.png
- progressbar.xml
- steps_icon.png
- stepsicon.xml
- stepsicon2.xml
- ticon.png
- timeicon.xml
- timeicon2.xml
- user_info_icon.png
- userinfo.xml
- userinfo2.xml
- weight_icon.xml
- weighticon.png
- drawable-v24
- layout
- menu
- mipmap-anydpi-v26
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- mipmap-xxxhdpi
- navigation
- values
- values-land
- values-night
- values-v29
- values-w1240dp
- values-w600dp
- xml
- drawable
- main
- build.gradle
- gradle
- gradle.properties
- gradlew
- gradlew.bat
- settings.gradle
- StepNCount
