Skip to content

Commit

Permalink
correction bug crash bbox not found
Browse files Browse the repository at this point in the history
  • Loading branch information
@TristanMoreau
TristanMoreau committed Nov 10, 2015
1 parent bf6de16 commit 2364342
Show file tree
Hide file tree
Showing 23 changed files with 58 additions and 33 deletions.
3 changes: 1 addition & 2 deletions RemoteTemplate/.idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion RemoteTemplate/.idea/libraries/appcompat_v7_20_0_0.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions RemoteTemplate/.idea/libraries/support_v4_20_0_0.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 25 additions & 17 deletions RemoteTemplate/.idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions RemoteTemplate/.idea/runConfigurations.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion RemoteTemplate/RemoteTemplate.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
Expand Down
9 changes: 6 additions & 3 deletions RemoteTemplate/app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
<task>generateDebugTestSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
Expand All @@ -24,7 +26,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
Expand Down Expand Up @@ -82,6 +84,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
Expand Down
Binary file modified RemoteTemplate/app/libs/lib-bbox-secondscreen-0.3.1-SNAPSHOT-debug.aar
View file
Binary file not shown.
Empty file modified ...plate/app/src/main/java/fr/bouyguestelecom/bboxlab/remotetemplate/ApplicationAdapter.java
100755 → 100644
View file
Empty file.
4 changes: 2 additions & 2 deletions RemoteTemplate/app/src/main/java/fr/bouyguestelecom/bboxlab/remotetemplate/MyActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ public void onSectionAttached(int number)
break;
case 7:
mTitle = getString(R.string.title_section7);
break;*/
break;
case 8:
mTitle = getString(R.string.title_section8);
break;
break;*/
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...app/src/main/java/fr/bouyguestelecom/bboxlab/remotetemplate/NavigationDrawerFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
getString(R.string.title_section2),
getString(R.string.title_section3),
getString(R.string.title_section4),
getString(R.string.title_section5),
getString(R.string.title_section5)/*,
getString(R.string.title_section6),
getString(R.string.title_section7),
getString(R.string.title_section8)
getString(R.string.title_section8)*/

}));
mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
Expand Down
Empty file modified ...ate/app/src/main/java/fr/bouyguestelecom/bboxlab/remotetemplate/NotificationsAdapter.java
100755 → 100644
View file
Empty file.
Empty file modified RemoteTemplate/app/src/main/res/layout/activity_main.xml
100755 → 100644
View file
Empty file.
Empty file modified RemoteTemplate/app/src/main/res/layout/element_app.xml
100755 → 100644
View file
Empty file.
Empty file modified RemoteTemplate/app/src/main/res/layout/element_notification.xml
100755 → 100644
View file
Empty file.
Empty file modified RemoteTemplate/app/src/main/res/layout/fragment_apps.xml
100755 → 100644
View file
Empty file.
Empty file modified RemoteTemplate/app/src/main/res/layout/fragment_main.xml
100755 → 100644
View file
Empty file.
Empty file modified RemoteTemplate/app/src/main/res/layout/fragment_navigation_drawer.xml
100755 → 100644
View file
Empty file.
Empty file modified RemoteTemplate/app/src/main/res/layout/fragment_notifications.xml
100755 → 100644
View file
Empty file.
Empty file modified RemoteTemplate/app/src/main/res/layout/fragment_remote.xml
100755 → 100644
View file
Empty file.
Empty file modified RemoteTemplate/app/src/main/res/layout/fragment_settings.xml
100755 → 100644
View file
Empty file.
9 changes: 6 additions & 3 deletions RemoteTemplate/com_example_google_tv_anymotelibrary/com_example_google_tv_anymotelibrary.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
<task>generateDebugTestSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
Expand All @@ -25,7 +27,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
Expand Down Expand Up @@ -83,6 +85,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
Expand Down
Empty file modified RemoteTemplate/gradlew
100755 → 100644
View file
Empty file.

0 comments on commit 2364342

Please sign in to comment.