• R/O
  • SSH
  • HTTPS

gokigen: コミット


コミットメタ情報

リビジョン423 (tree)
日時2018-01-14 01:09:01
作者mrsa

ログメッセージ

BLE関連のロジックをa01dから持ってくる。

変更サマリ

差分

--- android/AirA01b/trunk/.idea/workspace.xml (revision 422)
+++ android/AirA01b/trunk/.idea/workspace.xml (revision 423)
@@ -31,27 +31,28 @@
3131 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
3232 </component>
3333 <component name="ChangeListManager">
34- <list default="true" readonly="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="">
35- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraDateTimeSynchronizer.java" />
36- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ICameraDateTimeSynchronizer.java" />
37- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
34+ <list default="true" readonly="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="BLE関連のロジックをa01dからマージする。">
35+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble" />
36+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/ICameraPowerOn.java" />
37+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraEntryList.java" />
38+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraSetDialogDismiss.java" />
39+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListDialog.java" />
40+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListFragment.java" />
41+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraPowerOnSelector.java" />
42+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayAdapter.java" />
43+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayItem.java" />
44+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/PowerOnCamera.java" />
45+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/column_save_bt.xml" />
46+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/dialog_my_camera_entries.xml" />
3847 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
3948 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
4049 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
50+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
4151 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java" />
42- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java" />
43- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/CameraControlPanel.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/CameraControlPanel.java" />
44- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java" />
45- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" />
4652 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java" />
47- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java" />
48- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" afterPath="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" />
49- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-ja/arrays.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-ja/arrays.xml" />
5053 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" />
51- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/arrays.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/arrays.xml" />
5254 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
53- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" afterPath="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
54- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" />
55+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/openCVLibrary320/openCVLibrary320.iml" afterPath="$PROJECT_DIR$/openCVLibrary320/openCVLibrary320.iml" />
5556 </list>
5657 <ignored path="AirA01b.iws" />
5758 <ignored path=".idea/workspace.xml" />
@@ -82,7 +83,18 @@
8283 <favorites_list name="AirA01b" />
8384 </component>
8485 <component name="FileEditorManager">
85- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
86+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
87+ <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
88+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
89+ <provider selected="true" editor-type-id="text-editor">
90+ <state relative-caret-position="374">
91+ <caret line="22" column="53" lean-forward="true" selection-start-line="22" selection-start-column="53" selection-end-line="22" selection-end-column="53" />
92+ <folding />
93+ </state>
94+ </provider>
95+ </entry>
96+ </file>
97+ </leaf>
8698 </component>
8799 <component name="FileTemplateManagerImpl">
88100 <option name="RECENT_TEMPLATES">
@@ -2731,16 +2743,6 @@
27312743 <component name="IdeDocumentHistory">
27322744 <option name="CHANGED_PATHS">
27332745 <list>
2734- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ZoomLensStatusHolder.java" />
2735- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ZoomLensHolder.java" />
2736- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraPropertyProvider.java" />
2737- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraPropertyProxy.java" />
2738- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraControlPanel.java" />
2739- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IZoomLensHolder.java" />
2740- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/PanelDrawer.java" />
2741- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
2742- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/ConnectingFragment.java" />
2743- <option value="$PROJECT_DIR$/app/src/main/res/drawable/btn_ic_timer.xml" />
27442746 <option value="$PROJECT_DIR$/app/src/main/res/drawable/btn_ic_timer_off.xml" />
27452747 <option value="$PROJECT_DIR$/app/src/main/res/drawable/btn_ic_timer_on.xml" />
27462748 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/takepicture/BracketingShotControl.java" />
@@ -2754,7 +2756,6 @@
27542756 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/IPhoneCameraShutter.java" />
27552757 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/ILiveImageStatusNotify.java" />
27562758 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/PhoneCameraView.java" />
2757- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/OlyCameraLiveViewOnTouchListener.java" />
27582759 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/ImageManipulator.java" />
27592760 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/IStoreImage.java" />
27602761 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraLiveImageView.java" />
@@ -2763,16 +2764,11 @@
27632764 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java" />
27642765 <option value="$PROJECT_DIR$/openCVLibrary320/build.gradle" />
27652766 <option value="$PROJECT_DIR$/build.gradle" />
2766- <option value="$PROJECT_DIR$/app/build.gradle" />
27672767 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/takepicture/CameraDateTimeSynchronizer.java" />
2768- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java" />
27692768 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java" />
27702769 <option value="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
27712770 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java" />
27722771 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java" />
2773- <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
2774- <option value="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" />
2775- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java" />
27762772 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/IChangeScene.java" />
27772773 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ICameraDateTimeSynchronizer.java" />
27782774 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraDateTimeSynchronizer.java" />
@@ -2782,12 +2778,28 @@
27822778 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java" />
27832779 <option value="$PROJECT_DIR$/app/src/main/res/values-ja/arrays.xml" />
27842780 <option value="$PROJECT_DIR$/app/src/main/res/values/arrays.xml" />
2781+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/OlyCameraLiveViewOnTouchListener.java" />
2782+ <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
2783+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/ICameraPowerOn.java" />
2784+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraSetDialogDismiss.java" />
2785+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayItem.java" />
2786+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/PowerOnCamera.java" />
2787+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayAdapter.java" />
2788+ <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
2789+ <option value="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" />
2790+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListFragment.java" />
2791+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java" />
2792+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraPowerOnSelector.java" />
2793+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraEntryList.java" />
2794+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListDialog.java" />
2795+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java" />
2796+ <option value="$PROJECT_DIR$/app/build.gradle" />
27852797 </list>
27862798 </option>
27872799 </component>
27882800 <component name="ProjectFrameBounds">
2789- <option name="x" value="63" />
2790- <option name="y" value="-8" />
2801+ <option name="x" value="56" />
2802+ <option name="y" value="-2" />
27912803 <option name="width" value="2505" />
27922804 <option name="height" value="1456" />
27932805 </component>
@@ -2806,44 +2818,43 @@
28062818 <foldersAlwaysOnTop value="true" />
28072819 </navigator>
28082820 <panes>
2809- <pane id="Scratches" />
2810- <pane id="ProjectPane">
2821+ <pane id="AndroidView">
28112822 <subPane>
28122823 <PATH>
28132824 <PATH_ELEMENT>
28142825 <option name="myItemId" value="AirA01b" />
2815- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2826+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
28162827 </PATH_ELEMENT>
28172828 <PATH_ELEMENT>
2818- <option name="myItemId" value="AirA01b" />
2819- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2829+ <option name="myItemId" value="Gradle Scripts" />
2830+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
28202831 </PATH_ELEMENT>
28212832 </PATH>
28222833 <PATH>
28232834 <PATH_ELEMENT>
28242835 <option name="myItemId" value="AirA01b" />
2825- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2836+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
28262837 </PATH_ELEMENT>
28272838 <PATH_ELEMENT>
2828- <option name="myItemId" value="AirA01b" />
2829- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2839+ <option name="myItemId" value="app" />
2840+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
28302841 </PATH_ELEMENT>
2831- <PATH_ELEMENT>
2832- <option name="myItemId" value="gradle" />
2833- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2834- </PATH_ELEMENT>
28352842 </PATH>
28362843 <PATH>
28372844 <PATH_ELEMENT>
28382845 <option name="myItemId" value="AirA01b" />
2839- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2846+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
28402847 </PATH_ELEMENT>
28412848 <PATH_ELEMENT>
2842- <option name="myItemId" value="AirA01b" />
2843- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2849+ <option name="myItemId" value="app" />
2850+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
28442851 </PATH_ELEMENT>
28452852 <PATH_ELEMENT>
2846- <option name="myItemId" value="app" />
2853+ <option name="myItemId" value="java" />
2854+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidSourceTypeNode" />
2855+ </PATH_ELEMENT>
2856+ <PATH_ELEMENT>
2857+ <option name="myItemId" value="aira01b" />
28472858 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
28482859 </PATH_ELEMENT>
28492860 </PATH>
@@ -2850,22 +2861,18 @@
28502861 <PATH>
28512862 <PATH_ELEMENT>
28522863 <option name="myItemId" value="AirA01b" />
2853- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2864+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
28542865 </PATH_ELEMENT>
28552866 <PATH_ELEMENT>
2856- <option name="myItemId" value="AirA01b" />
2857- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2858- </PATH_ELEMENT>
2859- <PATH_ELEMENT>
28602867 <option name="myItemId" value="app" />
2861- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2868+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
28622869 </PATH_ELEMENT>
28632870 <PATH_ELEMENT>
2864- <option name="myItemId" value="src" />
2865- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2871+ <option name="myItemId" value="java" />
2872+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidSourceTypeNode" />
28662873 </PATH_ELEMENT>
28672874 <PATH_ELEMENT>
2868- <option name="myItemId" value="main" />
2875+ <option name="myItemId" value="aira01b" />
28692876 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
28702877 </PATH_ELEMENT>
28712878 </PATH>
@@ -2872,33 +2879,40 @@
28722879 <PATH>
28732880 <PATH_ELEMENT>
28742881 <option name="myItemId" value="AirA01b" />
2875- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2882+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
28762883 </PATH_ELEMENT>
28772884 <PATH_ELEMENT>
2878- <option name="myItemId" value="AirA01b" />
2879- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2885+ <option name="myItemId" value="app" />
2886+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
28802887 </PATH_ELEMENT>
28812888 <PATH_ELEMENT>
2882- <option name="myItemId" value="app" />
2883- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2889+ <option name="myItemId" value="java" />
2890+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidSourceTypeNode" />
28842891 </PATH_ELEMENT>
28852892 <PATH_ELEMENT>
2886- <option name="myItemId" value="src" />
2893+ <option name="myItemId" value="aira01b" />
28872894 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
28882895 </PATH_ELEMENT>
2896+ </PATH>
2897+ <PATH>
28892898 <PATH_ELEMENT>
2890- <option name="myItemId" value="main" />
2891- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2899+ <option name="myItemId" value="AirA01b" />
2900+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
28922901 </PATH_ELEMENT>
28932902 <PATH_ELEMENT>
2894- <option name="myItemId" value="res" />
2895- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2903+ <option name="myItemId" value="app" />
2904+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
28962905 </PATH_ELEMENT>
28972906 <PATH_ELEMENT>
2898- <option name="myItemId" value="xml" />
2899- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2907+ <option name="myItemId" value="java" />
2908+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidSourceTypeNode" />
29002909 </PATH_ELEMENT>
29012910 </PATH>
2911+ </subPane>
2912+ </pane>
2913+ <pane id="Scratches" />
2914+ <pane id="ProjectPane">
2915+ <subPane>
29022916 <PATH>
29032917 <PATH_ELEMENT>
29042918 <option name="myItemId" value="AirA01b" />
@@ -2908,24 +2922,32 @@
29082922 <option name="myItemId" value="AirA01b" />
29092923 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
29102924 </PATH_ELEMENT>
2925+ </PATH>
2926+ <PATH>
29112927 <PATH_ELEMENT>
2912- <option name="myItemId" value="app" />
2913- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2928+ <option name="myItemId" value="AirA01b" />
2929+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
29142930 </PATH_ELEMENT>
29152931 <PATH_ELEMENT>
2916- <option name="myItemId" value="src" />
2932+ <option name="myItemId" value="AirA01b" />
29172933 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
29182934 </PATH_ELEMENT>
29192935 <PATH_ELEMENT>
2920- <option name="myItemId" value="main" />
2936+ <option name="myItemId" value="gradle" />
29212937 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
29222938 </PATH_ELEMENT>
2939+ </PATH>
2940+ <PATH>
29232941 <PATH_ELEMENT>
2924- <option name="myItemId" value="res" />
2942+ <option name="myItemId" value="AirA01b" />
2943+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2944+ </PATH_ELEMENT>
2945+ <PATH_ELEMENT>
2946+ <option name="myItemId" value="AirA01b" />
29252947 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
29262948 </PATH_ELEMENT>
29272949 <PATH_ELEMENT>
2928- <option name="myItemId" value="values-ja" />
2950+ <option name="myItemId" value="app" />
29292951 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
29302952 </PATH_ELEMENT>
29312953 </PATH>
@@ -2950,14 +2972,6 @@
29502972 <option name="myItemId" value="main" />
29512973 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
29522974 </PATH_ELEMENT>
2953- <PATH_ELEMENT>
2954- <option name="myItemId" value="res" />
2955- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2956- </PATH_ELEMENT>
2957- <PATH_ELEMENT>
2958- <option name="myItemId" value="values" />
2959- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2960- </PATH_ELEMENT>
29612975 </PATH>
29622976 <PATH>
29632977 <PATH_ELEMENT>
@@ -3011,7 +3025,7 @@
30113025 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
30123026 </PATH_ELEMENT>
30133027 <PATH_ELEMENT>
3014- <option name="myItemId" value="menu" />
3028+ <option name="myItemId" value="values-ja" />
30153029 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
30163030 </PATH_ELEMENT>
30173031 </PATH>
@@ -3037,11 +3051,11 @@
30373051 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
30383052 </PATH_ELEMENT>
30393053 <PATH_ELEMENT>
3040- <option name="myItemId" value="java" />
3054+ <option name="myItemId" value="res" />
30413055 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
30423056 </PATH_ELEMENT>
30433057 <PATH_ELEMENT>
3044- <option name="myItemId" value="aira01b" />
3058+ <option name="myItemId" value="values" />
30453059 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
30463060 </PATH_ELEMENT>
30473061 </PATH>
@@ -3067,17 +3081,13 @@
30673081 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
30683082 </PATH_ELEMENT>
30693083 <PATH_ELEMENT>
3070- <option name="myItemId" value="java" />
3084+ <option name="myItemId" value="res" />
30713085 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
30723086 </PATH_ELEMENT>
30733087 <PATH_ELEMENT>
3074- <option name="myItemId" value="aira01b" />
3088+ <option name="myItemId" value="layout" />
30753089 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
30763090 </PATH_ELEMENT>
3077- <PATH_ELEMENT>
3078- <option name="myItemId" value="preference" />
3079- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3080- </PATH_ELEMENT>
30813091 </PATH>
30823092 <PATH>
30833093 <PATH_ELEMENT>
@@ -3108,10 +3118,6 @@
31083118 <option name="myItemId" value="aira01b" />
31093119 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
31103120 </PATH_ELEMENT>
3111- <PATH_ELEMENT>
3112- <option name="myItemId" value="liveview" />
3113- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3114- </PATH_ELEMENT>
31153121 </PATH>
31163122 <PATH>
31173123 <PATH_ELEMENT>
@@ -3143,108 +3149,85 @@
31433149 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
31443150 </PATH_ELEMENT>
31453151 <PATH_ELEMENT>
3146- <option name="myItemId" value="liveview" />
3152+ <option name="myItemId" value="preference" />
31473153 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
31483154 </PATH_ELEMENT>
3149- <PATH_ELEMENT>
3150- <option name="myItemId" value="controlpanel" />
3151- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3152- </PATH_ELEMENT>
31533155 </PATH>
3154- </subPane>
3155- </pane>
3156- <pane id="AndroidView">
3157- <subPane>
31583156 <PATH>
31593157 <PATH_ELEMENT>
31603158 <option name="myItemId" value="AirA01b" />
3161- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
3159+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
31623160 </PATH_ELEMENT>
31633161 <PATH_ELEMENT>
3164- <option name="myItemId" value="Gradle Scripts" />
3165- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
3166- </PATH_ELEMENT>
3167- </PATH>
3168- <PATH>
3169- <PATH_ELEMENT>
31703162 <option name="myItemId" value="AirA01b" />
3171- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
3163+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
31723164 </PATH_ELEMENT>
31733165 <PATH_ELEMENT>
31743166 <option name="myItemId" value="app" />
3175- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
3167+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
31763168 </PATH_ELEMENT>
3177- </PATH>
3178- <PATH>
31793169 <PATH_ELEMENT>
3180- <option name="myItemId" value="AirA01b" />
3181- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
3170+ <option name="myItemId" value="src" />
3171+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
31823172 </PATH_ELEMENT>
31833173 <PATH_ELEMENT>
3184- <option name="myItemId" value="app" />
3185- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
3174+ <option name="myItemId" value="main" />
3175+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
31863176 </PATH_ELEMENT>
31873177 <PATH_ELEMENT>
31883178 <option name="myItemId" value="java" />
3189- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidSourceTypeNode" />
3179+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
31903180 </PATH_ELEMENT>
31913181 <PATH_ELEMENT>
31923182 <option name="myItemId" value="aira01b" />
31933183 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
31943184 </PATH_ELEMENT>
3185+ <PATH_ELEMENT>
3186+ <option name="myItemId" value="olycamerawrapper" />
3187+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3188+ </PATH_ELEMENT>
31953189 </PATH>
31963190 <PATH>
31973191 <PATH_ELEMENT>
31983192 <option name="myItemId" value="AirA01b" />
3199- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
3193+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
32003194 </PATH_ELEMENT>
32013195 <PATH_ELEMENT>
3202- <option name="myItemId" value="app" />
3203- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
3196+ <option name="myItemId" value="AirA01b" />
3197+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
32043198 </PATH_ELEMENT>
32053199 <PATH_ELEMENT>
3206- <option name="myItemId" value="java" />
3207- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidSourceTypeNode" />
3200+ <option name="myItemId" value="app" />
3201+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
32083202 </PATH_ELEMENT>
32093203 <PATH_ELEMENT>
3210- <option name="myItemId" value="aira01b" />
3204+ <option name="myItemId" value="src" />
32113205 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
32123206 </PATH_ELEMENT>
3213- </PATH>
3214- <PATH>
32153207 <PATH_ELEMENT>
3216- <option name="myItemId" value="AirA01b" />
3217- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
3208+ <option name="myItemId" value="main" />
3209+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
32183210 </PATH_ELEMENT>
32193211 <PATH_ELEMENT>
3220- <option name="myItemId" value="app" />
3221- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
3222- </PATH_ELEMENT>
3223- <PATH_ELEMENT>
32243212 <option name="myItemId" value="java" />
3225- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidSourceTypeNode" />
3213+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
32263214 </PATH_ELEMENT>
32273215 <PATH_ELEMENT>
32283216 <option name="myItemId" value="aira01b" />
32293217 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
32303218 </PATH_ELEMENT>
3231- </PATH>
3232- <PATH>
32333219 <PATH_ELEMENT>
3234- <option name="myItemId" value="AirA01b" />
3235- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
3220+ <option name="myItemId" value="olycamerawrapper" />
3221+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
32363222 </PATH_ELEMENT>
32373223 <PATH_ELEMENT>
3238- <option name="myItemId" value="app" />
3239- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidModuleNode" />
3224+ <option name="myItemId" value="ble" />
3225+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
32403226 </PATH_ELEMENT>
3241- <PATH_ELEMENT>
3242- <option name="myItemId" value="java" />
3243- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NonAndroidSourceTypeNode" />
3244- </PATH_ELEMENT>
32453227 </PATH>
32463228 </subPane>
32473229 </pane>
3230+ <pane id="PackagesPane" />
32483231 <pane id="Scope">
32493232 <subPane subId="Project Files">
32503233 <PATH>
@@ -3265,7 +3248,6 @@
32653248 </PATH>
32663249 </subPane>
32673250 </pane>
3268- <pane id="PackagesPane" />
32693251 </panes>
32703252 </component>
32713253 <component name="PropertiesComponent">
@@ -3393,7 +3375,7 @@
33933375 <option name="ACTIVITY_CLASS" value="" />
33943376 <method>
33953377 <option name="Android.Gradle.BeforeRunTask" enabled="true" />
3396- <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1514908849386" />
3378+ <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1515859685173" />
33973379 </method>
33983380 </configuration>
33993381 <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
@@ -3441,7 +3423,7 @@
34413423 </Profilers>
34423424 <method>
34433425 <option name="Android.Gradle.BeforeRunTask" enabled="true" />
3444- <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1514908849386" />
3426+ <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1515859685173" />
34453427 </method>
34463428 </configuration>
34473429 <configuration default="true" type="Application" factoryName="Application">
@@ -3633,7 +3615,7 @@
36333615 <option name="ACTIVITY_CLASS" value="" />
36343616 <method>
36353617 <option name="Android.Gradle.BeforeRunTask" enabled="true" />
3636- <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1514908849390" />
3618+ <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1515859685173" />
36373619 </method>
36383620 </configuration>
36393621 <list size="1">
@@ -3809,20 +3791,6 @@
38093791 <option name="presentableId" value="Default" />
38103792 <updated>1469871562549</updated>
38113793 </task>
3812- <task id="LOCAL-00126" summary="操作パネル搭載のための準備その11。スワイプ入れたのデバック途中。">
3813- <created>1495243902756</created>
3814- <option name="number" value="00126" />
3815- <option name="presentableId" value="LOCAL-00126" />
3816- <option name="project" value="LOCAL" />
3817- <updated>1495243902774</updated>
3818- </task>
3819- <task id="LOCAL-00127" summary="操作パネル搭載のための準備その12。見た目以外の機能は完成。&#10;">
3820- <created>1495290506149</created>
3821- <option name="number" value="00127" />
3822- <option name="presentableId" value="LOCAL-00127" />
3823- <option name="project" value="LOCAL" />
3824- <updated>1495290506150</updated>
3825- </task>
38263794 <task id="LOCAL-00128" summary="操作パネル搭載のための準備その13。見た目を変えてみた。作例表示モードへのインパクトを治す必要あり。&#10;&#10;">
38273795 <created>1495378445382</created>
38283796 <option name="number" value="00128" />
@@ -4152,7 +4120,21 @@
41524120 <option name="project" value="LOCAL" />
41534121 <updated>1509196540318</updated>
41544122 </task>
4155- <option name="localTasksCounter" value="175" />
4123+ <task id="LOCAL-00175" summary="下部操作パネルのフリック感度調整機能を追加。&#10;スマホの時刻をカメラに設定する機能を追加。(呼び出せないが...)">
4124+ <created>1514908980107</created>
4125+ <option name="number" value="00175" />
4126+ <option name="presentableId" value="LOCAL-00175" />
4127+ <option name="project" value="LOCAL" />
4128+ <updated>1514908980108</updated>
4129+ </task>
4130+ <task id="LOCAL-00176" summary="GPSのロケーションがFIXしたときに操作不能になる不具合を改修。">
4131+ <created>1515765017102</created>
4132+ <option name="number" value="00176" />
4133+ <option name="presentableId" value="LOCAL-00176" />
4134+ <option name="project" value="LOCAL" />
4135+ <updated>1515765017102</updated>
4136+ </task>
4137+ <option name="localTasksCounter" value="177" />
41564138 <servers />
41574139 </component>
41584140 <component name="TodoView">
@@ -4165,32 +4147,30 @@
41654147 </todo-panel>
41664148 </component>
41674149 <component name="ToolWindowManager">
4168- <frame x="63" y="-8" width="2505" height="1456" extended-state="6" />
4150+ <frame x="56" y="-2" width="2505" height="1456" extended-state="0" />
41694151 <layout>
4170- <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
4171- <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="5" side_tool="true" content_ui="tabs" />
4172- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45839873" sideWeight="0.51249486" order="8" side_tool="true" content_ui="tabs" />
4173- <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32998455" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
4174- <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
4175- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
4176- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
4177- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.72096777" sideWeight="0.4923939" order="3" side_tool="false" content_ui="tabs" />
4178- <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
4152+ <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
41794153 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903227" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
41804154 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45749614" sideWeight="0.4875051" order="14" side_tool="false" content_ui="tabs" />
4155+ <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="5" side_tool="true" content_ui="tabs" />
41814156 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
41824157 <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
41834158 <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
4184- <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896355" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
4159+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45839873" sideWeight="0.51249486" order="8" side_tool="true" content_ui="tabs" />
41854160 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.118238024" sideWeight="0.4923939" order="2" side_tool="false" content_ui="tabs" />
41864161 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3265306" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
41874162 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903227" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
4163+ <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998455" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
41884164 <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
4165+ <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
41894166 <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46058732" sideWeight="0.50921756" order="13" side_tool="true" content_ui="tabs" />
4190- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21507579" sideWeight="0.4935484" order="2" side_tool="false" content_ui="tabs" />
4191- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33153015" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
4167+ <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
4168+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21507579" sideWeight="0.4935484" order="2" side_tool="false" content_ui="tabs" />
41924169 <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
4170+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
4171+ <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
41934172 <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
4173+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.72096777" sideWeight="0.4923939" order="3" side_tool="false" content_ui="tabs" />
41944174 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="7" side_tool="true" content_ui="tabs" />
41954175 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
41964176 <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -4202,6 +4182,8 @@
42024182 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
42034183 <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978287" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
42044184 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
4185+ <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896355" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
4186+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33153015" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
42054187 </layout>
42064188 </component>
42074189 <component name="Vcs.Log.UiProperties">
@@ -4216,9 +4198,6 @@
42164198 <option name="myLimit" value="2678400000" />
42174199 </component>
42184200 <component name="VcsManagerConfiguration">
4219- <MESSAGE value="ブラケット撮影をインターバル撮影と名称変更し、セルフタイマーの機能もカバーした。&#10;" />
4220- <MESSAGE value="タイマーのON/OFFアイコンを追加。" />
4221- <MESSAGE value="タイマーのON/OFFアイコンを動くようにした。これでしばし。" />
42224201 <MESSAGE value="カメラプロパティの一覧画面を、プロパティ名でソートして表示するようにした。インターバル撮影の名称でBKTからINTに修正した。&#10;" />
42234202 <MESSAGE value="1.7.0 リリース版。" />
42244203 <MESSAGE value="次バージョンリリース準備。" />
@@ -4241,7 +4220,10 @@
42414220 <MESSAGE value="プロパティの設定を、現在設定と違うものだけ設定するようにした。" />
42424221 <MESSAGE value="Android7 で、動画ファイルの共有ができなかった不具合を修正する。" />
42434222 <MESSAGE value="ビルドバージョンを更新する。" />
4244- <option name="LAST_COMMIT_MESSAGE" value="ビルドバージョンを更新する。" />
4223+ <MESSAGE value="下部操作パネルのフリック感度調整機能を追加。&#10;スマホの時刻をカメラに設定する機能を追加。(呼び出せないが...)" />
4224+ <MESSAGE value="GPSのロケーションがFIXしたときに操作不能になる不具合を改修。" />
4225+ <MESSAGE value="BLE関連のロジックをa01dからマージする。" />
4226+ <option name="LAST_COMMIT_MESSAGE" value="BLE関連のロジックをa01dからマージする。" />
42454227 </component>
42464228 <component name="XDebuggerManager">
42474229 <breakpoint-manager>
@@ -4253,104 +4235,6 @@
42534235 <watches-manager />
42544236 </component>
42554237 <component name="editorHistoryManager">
4256- <entry file="file://C:/APL/Android/sdk/sources/android-25/android/hardware/Camera.java">
4257- <provider selected="true" editor-type-id="text-editor">
4258- <state relative-caret-position="273">
4259- <caret line="1411" column="22" lean-forward="false" selection-start-line="1411" selection-start-column="22" selection-end-line="1411" selection-end-column="22" />
4260- </state>
4261- </provider>
4262- </entry>
4263- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/PhoneCameraView.java">
4264- <provider selected="true" editor-type-id="text-editor">
4265- <state relative-caret-position="386">
4266- <caret line="228" column="58" lean-forward="false" selection-start-line="228" selection-start-column="58" selection-end-line="228" selection-end-column="58" />
4267- </state>
4268- </provider>
4269- </entry>
4270- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/ILiveImageStatusNotify.java">
4271- <provider selected="true" editor-type-id="text-editor">
4272- <state relative-caret-position="136">
4273- <caret line="8" column="10" lean-forward="false" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
4274- </state>
4275- </provider>
4276- </entry>
4277- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/phonecamera/IPhoneCameraShutter.java">
4278- <provider selected="true" editor-type-id="text-editor">
4279- <state relative-caret-position="68">
4280- <caret line="4" column="17" lean-forward="false" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
4281- </state>
4282- </provider>
4283- </entry>
4284- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/ImageManipulator.java">
4285- <provider selected="true" editor-type-id="text-editor">
4286- <state relative-caret-position="697">
4287- <caret line="721" column="6" lean-forward="false" selection-start-line="721" selection-start-column="6" selection-end-line="721" selection-end-column="6" />
4288- </state>
4289- </provider>
4290- </entry>
4291- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/IImageManipulatorOperator.java">
4292- <provider selected="true" editor-type-id="text-editor">
4293- <state relative-caret-position="136">
4294- <caret line="9" column="10" lean-forward="false" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
4295- </state>
4296- </provider>
4297- </entry>
4298- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/ManipulateImageFragment.java">
4299- <provider selected="true" editor-type-id="text-editor">
4300- <state relative-caret-position="1115">
4301- <caret line="368" column="0" lean-forward="false" selection-start-line="368" selection-start-column="0" selection-end-line="368" selection-end-column="0" />
4302- </state>
4303- </provider>
4304- </entry>
4305- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/IManipulateImageOperation.java">
4306- <provider selected="true" editor-type-id="text-editor">
4307- <state relative-caret-position="34">
4308- <caret line="2" column="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
4309- </state>
4310- </provider>
4311- </entry>
4312- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/IManipulateImageHolder.java">
4313- <provider selected="true" editor-type-id="text-editor">
4314- <state relative-caret-position="68">
4315- <caret line="4" column="10" lean-forward="false" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
4316- </state>
4317- </provider>
4318- </entry>
4319- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/manipulate/EffectImageProcessor.java">
4320- <provider selected="true" editor-type-id="text-editor">
4321- <state relative-caret-position="833">
4322- <caret line="380" column="29" lean-forward="false" selection-start-line="365" selection-start-column="0" selection-end-line="387" selection-end-column="0" />
4323- </state>
4324- </provider>
4325- </entry>
4326- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/IStoreImage.java">
4327- <provider selected="true" editor-type-id="text-editor">
4328- <state relative-caret-position="153">
4329- <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
4330- </state>
4331- </provider>
4332- </entry>
4333- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/StoreImage.java">
4334- <provider selected="true" editor-type-id="text-editor">
4335- <state relative-caret-position="1080">
4336- <caret line="160" column="15" lean-forward="false" selection-start-line="160" selection-start-column="15" selection-end-line="160" selection-end-column="15" />
4337- </state>
4338- </provider>
4339- </entry>
4340- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraPropertyLoadSaveOperations.java">
4341- <provider selected="true" editor-type-id="text-editor">
4342- <state relative-caret-position="995">
4343- <caret line="177" column="50" lean-forward="false" selection-start-line="177" selection-start-column="39" selection-end-line="177" selection-end-column="57" />
4344- </state>
4345- </provider>
4346- </entry>
4347- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/ConnectingFragment.java">
4348- <provider selected="true" editor-type-id="text-editor">
4349- <state relative-caret-position="774">
4350- <caret line="122" column="7" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="123" selection-end-column="0" />
4351- </state>
4352- </provider>
4353- </entry>
43544238 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraLiveImageView.java">
43554239 <provider selected="true" editor-type-id="text-editor">
43564240 <state relative-caret-position="570">
@@ -4358,13 +4242,6 @@
43584242 </state>
43594243 </provider>
43604244 </entry>
4361- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/OlyCameraLiveViewOnTouchListener.java">
4362- <provider selected="true" editor-type-id="text-editor">
4363- <state relative-caret-position="961">
4364- <caret line="283" column="40" lean-forward="false" selection-start-line="283" selection-start-column="29" selection-end-line="283" selection-end-column="55" />
4365- </state>
4366- </provider>
4367- </entry>
43684245 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycameraproperty/CameraPropertyLoader.java">
43694246 <provider selected="true" editor-type-id="text-editor">
43704247 <state relative-caret-position="68">
@@ -4386,17 +4263,6 @@
43864263 </state>
43874264 </provider>
43884265 </entry>
4389- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
4390- <provider editor-type-id="android-manifest">
4391- <state />
4392- </provider>
4393- <provider selected="true" editor-type-id="text-editor">
4394- <state relative-caret-position="527">
4395- <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
4396- <folding />
4397- </state>
4398- </provider>
4399- </entry>
44004266 <entry file="file://$PROJECT_DIR$/settings.gradle">
44014267 <provider selected="true" editor-type-id="text-editor">
44024268 <state relative-caret-position="0">
@@ -4409,7 +4275,6 @@
44094275 <provider selected="true" editor-type-id="text-editor">
44104276 <state relative-caret-position="153">
44114277 <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
4412- <folding />
44134278 </state>
44144279 </provider>
44154280 </entry>
@@ -4442,19 +4307,10 @@
44424307 </state>
44434308 </provider>
44444309 </entry>
4445- <entry file="file://$PROJECT_DIR$/app/build.gradle">
4446- <provider selected="true" editor-type-id="text-editor">
4447- <state relative-caret-position="306">
4448- <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
4449- <folding />
4450- </state>
4451- </provider>
4452- </entry>
44534310 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceScreenArbitrator.java">
44544311 <provider selected="true" editor-type-id="text-editor">
44554312 <state relative-caret-position="136">
44564313 <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
4457- <folding />
44584314 </state>
44594315 </provider>
44604316 </entry>
@@ -4469,7 +4325,6 @@
44694325 <provider selected="true" editor-type-id="text-editor">
44704326 <state relative-caret-position="11">
44714327 <caret line="6" column="17" lean-forward="false" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
4472- <folding />
44734328 </state>
44744329 </provider>
44754330 </entry>
@@ -4484,30 +4339,23 @@
44844339 <provider selected="true" editor-type-id="text-editor">
44854340 <state relative-caret-position="493">
44864341 <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
4487- <folding>
4488- <element signature="imports" expanded="true" />
4489- </folding>
44904342 </state>
44914343 </provider>
44924344 </entry>
44934345 <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/preferences.xml">
4494- <provider editor-type-id="android-designer2">
4495- <state />
4496- </provider>
44974346 <provider selected="true" editor-type-id="text-editor">
44984347 <state relative-caret-position="374">
44994348 <caret line="229" column="23" lean-forward="true" selection-start-line="229" selection-start-column="23" selection-end-line="229" selection-end-column="23" />
4500- <folding>
4501- <element signature="e#8579#8607#0" expanded="true" />
4502- </folding>
45034349 </state>
45044350 </provider>
4351+ <provider editor-type-id="android-designer2">
4352+ <state />
4353+ </provider>
45054354 </entry>
45064355 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java">
45074356 <provider selected="true" editor-type-id="text-editor">
45084357 <state relative-caret-position="473">
45094358 <caret line="243" column="0" lean-forward="false" selection-start-line="243" selection-start-column="0" selection-end-line="243" selection-end-column="0" />
4510- <folding />
45114359 </state>
45124360 </provider>
45134361 </entry>
@@ -4515,9 +4363,6 @@
45154363 <provider selected="true" editor-type-id="text-editor">
45164364 <state relative-caret-position="555">
45174365 <caret line="701" column="20" lean-forward="true" selection-start-line="701" selection-start-column="20" selection-end-line="701" selection-end-column="20" />
4518- <folding>
4519- <element signature="e#6695#6741#0" expanded="false" />
4520- </folding>
45214366 </state>
45224367 </provider>
45234368 </entry>
@@ -4525,7 +4370,6 @@
45254370 <provider selected="true" editor-type-id="text-editor">
45264371 <state relative-caret-position="453">
45274372 <caret line="66" column="11" lean-forward="false" selection-start-line="66" selection-start-column="11" selection-end-line="66" selection-end-column="11" />
4528- <folding />
45294373 </state>
45304374 </provider>
45314375 </entry>
@@ -4533,41 +4377,13 @@
45334377 <provider selected="true" editor-type-id="text-editor">
45344378 <state relative-caret-position="-108">
45354379 <caret line="23" column="16" lean-forward="false" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" />
4536- <folding>
4537- <element signature="imports" expanded="true" />
4538- <element signature="e#1158#1192#0" expanded="true" />
4539- <element signature="e#1194#1231#0" expanded="true" />
4540- </folding>
45414380 </state>
45424381 </provider>
45434382 </entry>
4544- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java">
4545- <provider selected="true" editor-type-id="text-editor">
4546- <state relative-caret-position="5593">
4547- <caret line="423" column="0" lean-forward="false" selection-start-line="423" selection-start-column="0" selection-end-line="423" selection-end-column="0" />
4548- <folding>
4549- <element signature="e#6393#6583#0" expanded="true" />
4550- <element signature="e#6582#6583#0" expanded="true" />
4551- <element signature="e#6956#7148#0" expanded="true" />
4552- <element signature="e#7147#7148#0" expanded="true" />
4553- <element signature="e#8400#8447#0" expanded="true" />
4554- <element signature="e#8607#8652#0" expanded="true" />
4555- <element signature="e#8654#8916#0" expanded="true" />
4556- <element signature="e#8915#8916#0" expanded="true" />
4557- <element signature="e#8952#8997#0" expanded="true" />
4558- <element signature="e#8999#9955#0" expanded="true" />
4559- <element signature="e#9954#9955#0" expanded="true" />
4560- <element signature="e#9980#10126#0" expanded="true" />
4561- <element signature="e#10125#10126#0" expanded="true" />
4562- </folding>
4563- </state>
4564- </provider>
4565- </entry>
45664383 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/IChangeScene.java">
45674384 <provider selected="true" editor-type-id="text-editor">
45684385 <state relative-caret-position="255">
45694386 <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
4570- <folding />
45714387 </state>
45724388 </provider>
45734389 </entry>
@@ -4575,7 +4391,6 @@
45754391 <provider selected="true" editor-type-id="text-editor">
45764392 <state relative-caret-position="85">
45774393 <caret line="5" column="51" lean-forward="false" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="51" />
4578- <folding />
45794394 </state>
45804395 </provider>
45814396 </entry>
@@ -4583,7 +4398,6 @@
45834398 <provider selected="true" editor-type-id="text-editor">
45844399 <state relative-caret-position="-527">
45854400 <caret line="114" column="12" lean-forward="false" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="27" />
4586- <folding />
45874401 </state>
45884402 </provider>
45894403 </entry>
@@ -4591,56 +4405,113 @@
45914405 <provider selected="true" editor-type-id="text-editor">
45924406 <state relative-caret-position="289">
45934407 <caret line="62" column="0" lean-forward="true" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
4594- <folding />
45954408 </state>
45964409 </provider>
45974410 </entry>
45984411 <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_view.xml">
4599- <provider editor-type-id="android-designer2">
4600- <state />
4601- </provider>
46024412 <provider selected="true" editor-type-id="text-editor">
46034413 <state relative-caret-position="0">
46044414 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
4605- <folding />
46064415 </state>
46074416 </provider>
4417+ <provider editor-type-id="android-designer2">
4418+ <state />
4419+ </provider>
46084420 </entry>
46094421 <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml">
4422+ <provider selected="true" editor-type-id="text-editor">
4423+ <state relative-caret-position="459">
4424+ <caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
4425+ </state>
4426+ </provider>
46104427 <provider editor-type-id="android-designer2">
46114428 <state />
46124429 </provider>
4430+ </entry>
4431+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java">
46134432 <provider selected="true" editor-type-id="text-editor">
4614- <state relative-caret-position="459">
4615- <caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
4433+ <state relative-caret-position="3893">
4434+ <caret line="259" column="36" lean-forward="true" selection-start-line="259" selection-start-column="36" selection-end-line="259" selection-end-column="36" />
4435+ </state>
4436+ </provider>
4437+ </entry>
4438+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/arrays.xml">
4439+ <provider selected="true" editor-type-id="text-editor">
4440+ <state relative-caret-position="1598">
4441+ <caret line="94" column="0" lean-forward="false" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
4442+ </state>
4443+ </provider>
4444+ </entry>
4445+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ja/arrays.xml">
4446+ <provider selected="true" editor-type-id="text-editor">
4447+ <state relative-caret-position="419">
4448+ <caret line="486" column="22" lean-forward="false" selection-start-line="486" selection-start-column="22" selection-end-line="486" selection-end-column="22" />
4449+ </state>
4450+ </provider>
4451+ </entry>
4452+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/CameraControlPanel.java">
4453+ <provider selected="true" editor-type-id="text-editor">
4454+ <state relative-caret-position="6888">
4455+ <caret line="842" column="13" lean-forward="false" selection-start-line="842" selection-start-column="13" selection-end-line="842" selection-end-column="13" />
4456+ </state>
4457+ </provider>
4458+ </entry>
4459+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/OlyCameraLiveViewOnTouchListener.java">
4460+ <provider selected="true" editor-type-id="text-editor">
4461+ <state relative-caret-position="3685">
4462+ <caret line="260" column="49" lean-forward="false" selection-start-line="260" selection-start-column="49" selection-end-line="260" selection-end-column="49" />
46164463 <folding>
4617- <element signature="e#333#358#0" expanded="true" />
4618- <element signature="e#572#608#0" expanded="true" />
4619- <element signature="e#813#834#0" expanded="true" />
4464+ <element signature="e#6707#6728#0" expanded="true" />
4465+ <element signature="e#6839#6865#0" expanded="true" />
46204466 </folding>
46214467 </state>
46224468 </provider>
46234469 </entry>
4624- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
4470+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/gps/IGpsLocationNotify.java">
46254471 <provider selected="true" editor-type-id="text-editor">
4626- <state relative-caret-position="544">
4627- <caret line="88" column="7" lean-forward="false" selection-start-line="88" selection-start-column="0" selection-end-line="88" selection-end-column="75" />
4472+ <state relative-caret-position="170">
4473+ <caret line="10" column="20" lean-forward="false" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="26" />
4474+ </state>
4475+ </provider>
4476+ </entry>
4477+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/gps/GpsLocationPicker.java">
4478+ <provider selected="true" editor-type-id="text-editor">
4479+ <state relative-caret-position="1067">
4480+ <caret line="237" column="33" lean-forward="false" selection-start-line="237" selection-start-column="21" selection-end-line="237" selection-end-column="38" />
4481+ </state>
4482+ </provider>
4483+ </entry>
4484+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
4485+ <provider selected="true" editor-type-id="text-editor">
4486+ <state relative-caret-position="187">
4487+ <caret line="11" column="80" lean-forward="false" selection-start-line="11" selection-start-column="80" selection-end-line="11" selection-end-column="80" />
46284488 <folding />
46294489 </state>
46304490 </provider>
4491+ <provider editor-type-id="android-manifest">
4492+ <state />
4493+ </provider>
46314494 </entry>
4495+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraConnectSequence.java">
4496+ <provider selected="true" editor-type-id="text-editor">
4497+ <state relative-caret-position="0">
4498+ <caret line="0" column="6" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="49" />
4499+ <folding />
4500+ </state>
4501+ </provider>
4502+ </entry>
46324503 <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml">
46334504 <provider selected="true" editor-type-id="text-editor">
4634- <state relative-caret-position="425">
4635- <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
4505+ <state relative-caret-position="1088">
4506+ <caret line="224" column="0" lean-forward="false" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
46364507 <folding />
46374508 </state>
46384509 </provider>
46394510 </entry>
4640- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java">
4511+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
46414512 <provider selected="true" editor-type-id="text-editor">
4642- <state relative-caret-position="3893">
4643- <caret line="259" column="36" lean-forward="true" selection-start-line="259" selection-start-column="36" selection-end-line="259" selection-end-column="36" />
4513+ <state relative-caret-position="1156">
4514+ <caret line="230" column="56" lean-forward="false" selection-start-line="230" selection-start-column="56" selection-end-line="230" selection-end-column="56" />
46444515 <folding />
46454516 </state>
46464517 </provider>
@@ -4647,35 +4518,131 @@
46474518 </entry>
46484519 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java">
46494520 <provider selected="true" editor-type-id="text-editor">
4650- <state relative-caret-position="812">
4651- <caret line="95" column="56" lean-forward="false" selection-start-line="95" selection-start-column="11" selection-end-line="95" selection-end-column="56" />
4521+ <state relative-caret-position="863">
4522+ <caret line="98" column="0" lean-forward="false" selection-start-line="98" selection-start-column="0" selection-end-line="98" selection-end-column="0" />
46524523 <folding />
46534524 </state>
46544525 </provider>
46554526 </entry>
4656- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/arrays.xml">
4527+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/PowerOnCamera.java">
46574528 <provider selected="true" editor-type-id="text-editor">
4658- <state relative-caret-position="1598">
4659- <caret line="94" column="0" lean-forward="false" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
4529+ <state relative-caret-position="408">
4530+ <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
4531+ <folding>
4532+ <element signature="imports" expanded="true" />
4533+ </folding>
4534+ </state>
4535+ </provider>
4536+ </entry>
4537+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_my_camera_entries.xml">
4538+ <provider editor-type-id="text-editor">
4539+ <state relative-caret-position="0">
4540+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
46604541 <folding />
46614542 </state>
46624543 </provider>
4544+ <provider selected="true" editor-type-id="android-designer2">
4545+ <state />
4546+ </provider>
46634547 </entry>
4664- <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ja/arrays.xml">
4548+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/column_save_bt.xml">
4549+ <provider editor-type-id="text-editor">
4550+ <state relative-caret-position="0">
4551+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
4552+ <folding />
4553+ </state>
4554+ </provider>
4555+ <provider selected="true" editor-type-id="android-designer2">
4556+ <state />
4557+ </provider>
4558+ </entry>
4559+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayItem.java">
46654560 <provider selected="true" editor-type-id="text-editor">
4666- <state relative-caret-position="419">
4667- <caret line="486" column="22" lean-forward="false" selection-start-line="486" selection-start-column="22" selection-end-line="486" selection-end-column="22" />
4561+ <state relative-caret-position="34">
4562+ <caret line="2" column="6" lean-forward="false" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
46684563 <folding />
46694564 </state>
46704565 </provider>
46714566 </entry>
4672- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/CameraControlPanel.java">
4567+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListDialog.java">
46734568 <provider selected="true" editor-type-id="text-editor">
4674- <state relative-caret-position="6888">
4675- <caret line="842" column="13" lean-forward="false" selection-start-line="842" selection-start-column="13" selection-end-line="842" selection-end-column="13" />
4569+ <state relative-caret-position="459">
4570+ <caret line="27" column="61" lean-forward="true" selection-start-line="27" selection-start-column="61" selection-end-line="27" selection-end-column="61" />
4571+ <folding>
4572+ <element signature="imports" expanded="true" />
4573+ </folding>
4574+ </state>
4575+ </provider>
4576+ </entry>
4577+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayAdapter.java">
4578+ <provider selected="true" editor-type-id="text-editor">
4579+ <state relative-caret-position="323">
4580+ <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
4581+ <folding>
4582+ <element signature="imports" expanded="true" />
4583+ </folding>
4584+ </state>
4585+ </provider>
4586+ </entry>
4587+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraSetDialogDismiss.java">
4588+ <provider selected="true" editor-type-id="text-editor">
4589+ <state relative-caret-position="34">
4590+ <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
46764591 <folding />
46774592 </state>
46784593 </provider>
46794594 </entry>
4595+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraEntryList.java">
4596+ <provider selected="true" editor-type-id="text-editor">
4597+ <state relative-caret-position="34">
4598+ <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
4599+ <folding />
4600+ </state>
4601+ </provider>
4602+ </entry>
4603+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/ICameraPowerOn.java">
4604+ <provider selected="true" editor-type-id="text-editor">
4605+ <state relative-caret-position="34">
4606+ <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
4607+ <folding />
4608+ </state>
4609+ </provider>
4610+ </entry>
4611+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraPowerOnSelector.java">
4612+ <provider selected="true" editor-type-id="text-editor">
4613+ <state relative-caret-position="782">
4614+ <caret line="49" column="9" lean-forward="false" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
4615+ <folding>
4616+ <element signature="imports" expanded="true" />
4617+ </folding>
4618+ </state>
4619+ </provider>
4620+ </entry>
4621+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListFragment.java">
4622+ <provider selected="true" editor-type-id="text-editor">
4623+ <state relative-caret-position="306">
4624+ <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
4625+ <folding>
4626+ <element signature="imports" expanded="true" />
4627+ </folding>
4628+ </state>
4629+ </provider>
4630+ </entry>
4631+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java">
4632+ <provider selected="true" editor-type-id="text-editor">
4633+ <state relative-caret-position="918">
4634+ <caret line="85" column="47" lean-forward="true" selection-start-line="85" selection-start-column="47" selection-end-line="85" selection-end-column="47" />
4635+ <folding />
4636+ </state>
4637+ </provider>
4638+ </entry>
4639+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
4640+ <provider selected="true" editor-type-id="text-editor">
4641+ <state relative-caret-position="374">
4642+ <caret line="22" column="53" lean-forward="true" selection-start-line="22" selection-start-column="53" selection-end-line="22" selection-end-column="53" />
4643+ <folding />
4644+ </state>
4645+ </provider>
4646+ </entry>
46804647 </component>
46814648 </project>
\ No newline at end of file
--- android/AirA01b/trunk/app/src/main/AndroidManifest.xml (revision 422)
+++ android/AirA01b/trunk/app/src/main/AndroidManifest.xml (revision 423)
@@ -1,7 +1,6 @@
11 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
22 package="jp.osdn.gokigen.aira01b">
33
4-
54 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
65 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
76 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -8,6 +7,9 @@
87 <uses-permission android:name="android.permission.INTERNET"/>
98 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
109 <uses-permission android:name="android.permission.CAMERA" />
10+ <uses-permission android:name="android.permission.BLUETOOTH" />
11+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
12+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
1113
1214 <uses-feature android:name="android.hardware.location.gps" />
1315 <uses-feature android:name="android.hardware.camera" />
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java (revision 422)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java (revision 423)
@@ -104,6 +104,9 @@
104104 (ContextCompat.checkSelfPermission(this, permission.ACCESS_NETWORK_STATE) != PackageManager.PERMISSION_GRANTED)||
105105 (ContextCompat.checkSelfPermission(this, permission.ACCESS_WIFI_STATE) != PackageManager.PERMISSION_GRANTED)||
106106 (ContextCompat.checkSelfPermission(this, permission.INTERNET) != PackageManager.PERMISSION_GRANTED)||
107+ (ContextCompat.checkSelfPermission(this, permission.BLUETOOTH) != PackageManager.PERMISSION_GRANTED) ||
108+ (ContextCompat.checkSelfPermission(this, permission.BLUETOOTH_ADMIN) != PackageManager.PERMISSION_GRANTED) ||
109+ (ContextCompat.checkSelfPermission(this, permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) ||
107110 (ContextCompat.checkSelfPermission(this, permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED))
108111 {
109112 ActivityCompat.requestPermissions(this,
@@ -113,6 +116,9 @@
113116 permission.ACCESS_NETWORK_STATE,
114117 permission.ACCESS_WIFI_STATE,
115118 permission.INTERNET,
119+ permission.BLUETOOTH,
120+ permission.BLUETOOTH_ADMIN,
121+ permission.ACCESS_COARSE_LOCATION,
116122 permission.ACCESS_FINE_LOCATION,
117123 },
118124 REQUEST_NEED_PERMISSIONS);
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/ICameraPowerOn.java (nonexistent)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/ICameraPowerOn.java (revision 423)
@@ -0,0 +1,13 @@
1+package jp.osdn.gokigen.aira01b.olycamerawrapper.ble;
2+
3+public interface ICameraPowerOn
4+{
5+ // カメラ起動指示
6+ void wakeup(PowerOnCameraCallback callback);
7+
8+ // 実行終了時のコールバックのインタフェース
9+ interface PowerOnCameraCallback
10+ {
11+ void wakeupExecuted(boolean isExecute);
12+ }
13+}
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraEntryList.java (nonexistent)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraEntryList.java (revision 423)
@@ -0,0 +1,9 @@
1+package jp.osdn.gokigen.aira01b.olycamerawrapper.ble;
2+
3+public interface IOlyCameraEntryList
4+{
5+ int MAX_STORE_PROPERTIES = 16; // Olympus Airは、最大10個登録可能
6+ String NAME_KEY = "AirBtName";
7+ String CODE_KEY = "AirBtCode";
8+ String DATE_KEY = "AirBtId";
9+}
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraSetDialogDismiss.java (nonexistent)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraSetDialogDismiss.java (revision 423)
@@ -0,0 +1,6 @@
1+package jp.osdn.gokigen.aira01b.olycamerawrapper.ble;
2+
3+public interface IOlyCameraSetDialogDismiss
4+{
5+ void setOlyCameraSet(String id, String name, String code, String info);
6+}
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListDialog.java (nonexistent)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListDialog.java (revision 423)
@@ -0,0 +1,118 @@
1+package jp.osdn.gokigen.aira01b.olycamerawrapper.ble;
2+
3+import android.app.Dialog;
4+import android.content.SharedPreferences;
5+import android.preference.PreferenceManager;
6+import android.support.annotation.NonNull;
7+import android.support.v4.app.DialogFragment;
8+import android.support.v4.app.FragmentManager;
9+import android.support.v4.app.FragmentTransaction;
10+import android.os.Bundle;
11+import android.util.Log;
12+import android.view.LayoutInflater;
13+import android.view.View;
14+import android.view.ViewGroup;
15+
16+import java.text.DateFormat;
17+import java.util.Date;
18+
19+import jp.osdn.gokigen.aira01b.R;
20+
21+public class OlyCameraEntryListDialog extends DialogFragment implements IOlyCameraSetDialogDismiss
22+{
23+ private final String TAG = this.toString();
24+ private boolean viewCreated = false;
25+ private View myView = null;
26+ private String message = "";
27+ private String title = "";
28+ private OlyCameraEntryListFragment listFragment = OlyCameraEntryListFragment.newInstance(this);
29+
30+ public static OlyCameraEntryListDialog newInstance(String title, String message)
31+ {
32+ OlyCameraEntryListDialog instance = new OlyCameraEntryListDialog();
33+
34+ // ダイアログに渡すパラメータはBundleにまとめておく
35+ Bundle arguments = new Bundle();
36+ arguments.putString("title", title);
37+ arguments.putString("message", message);
38+ instance.setArguments(arguments);
39+
40+ Log.v("dialog", "title: " + title + " message: " + message);
41+ return (instance);
42+ }
43+
44+ @Override
45+ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
46+ {
47+ Log.v(TAG, "onCreateView()");
48+
49+ Bundle arguments = getArguments();
50+ if (arguments != null)
51+ {
52+ title = arguments.getString("title");
53+ message = arguments.getString("message");
54+ Log.v(TAG, "title: " + title + " message: " + message);
55+ }
56+
57+ if ((viewCreated)&&(myView != null))
58+ {
59+ // Viewを再利用。。。
60+ Log.v(TAG, "onCreateView() : called again, so do nothing... : " + myView);
61+ return (myView);
62+ }
63+ View view = inflater.inflate(R.layout.dialog_my_camera_entries, container, false);
64+
65+ myView = view;
66+ viewCreated = true;
67+
68+ // listFragmentを子フラグメントとする(Nested Fragment を使う)
69+ FragmentManager fragmentManager = getChildFragmentManager();
70+ FragmentTransaction transaction = fragmentManager.beginTransaction();
71+ transaction.add(R.id.layout_content, listFragment, "list_fragment");
72+ transaction.commit();
73+
74+ return (view);
75+ }
76+ @Override
77+ public @NonNull Dialog onCreateDialog(Bundle savedInstanceState)
78+ {
79+ Log.v(TAG, "onCreateDialog() : " + title + " (" + message + ")");
80+ Dialog dialog = super.onCreateDialog(savedInstanceState);
81+ dialog.setTitle(title);
82+ return (dialog);
83+ }
84+
85+ /**
86+ *
87+ *
88+ */
89+ @Override
90+ public void setOlyCameraSet(String id, String name, String code, String info)
91+ {
92+ String namePrefKey = id + IOlyCameraEntryList.NAME_KEY;
93+ String codePrefKey = id + IOlyCameraEntryList.CODE_KEY;
94+ String infoPrefKey = id + IOlyCameraEntryList.DATE_KEY;
95+
96+ DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
97+ String dateInfo = dateFormat.format(new Date());
98+
99+ try
100+ {
101+ SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
102+ SharedPreferences.Editor editor = preferences.edit();
103+
104+ editor.putString(namePrefKey, name);
105+ editor.putString(codePrefKey, code);
106+ editor.putString(infoPrefKey, dateInfo);
107+
108+ editor.apply();
109+ }
110+ catch (Exception e)
111+ {
112+ e.printStackTrace();
113+ }
114+ Log.v(TAG, "setOlyCameraSet() REGISTERED : [" + id + "] " + name + " " + code + " " + dateInfo);
115+
116+ dismiss();
117+ }
118+}
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListFragment.java (nonexistent)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListFragment.java (revision 423)
@@ -0,0 +1,73 @@
1+package jp.osdn.gokigen.aira01b.olycamerawrapper.ble;
2+
3+import android.content.SharedPreferences;
4+import android.os.Bundle;
5+import android.support.annotation.NonNull;
6+import android.support.v4.app.ListFragment;
7+import android.preference.PreferenceManager;
8+import android.util.Log;
9+import android.view.LayoutInflater;
10+import android.view.View;
11+import android.view.ViewGroup;
12+
13+import java.util.ArrayList;
14+import java.util.List;
15+import java.util.Locale;
16+
17+import jp.osdn.gokigen.aira01b.R;
18+
19+public class OlyCameraEntryListFragment extends ListFragment
20+{
21+ private String TAG = toString();
22+ private IOlyCameraSetDialogDismiss dialogDismiss = null;
23+
24+ public static OlyCameraEntryListFragment newInstance(IOlyCameraSetDialogDismiss dismiss)
25+ {
26+ OlyCameraEntryListFragment instance = new OlyCameraEntryListFragment();
27+ instance.dialogDismiss = dismiss;
28+
29+ return (instance);
30+ }
31+
32+ /**/
33+ @Override
34+ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
35+ {
36+ Log.v(TAG, "onCreateView()");
37+ return (inflater.inflate(R.layout.list_camera_properties, container, false));
38+ }
39+
40+ @Override
41+ public void onActivityCreated(Bundle savedInstanceState)
42+ {
43+ Log.v(TAG, "onActivityCreated()");
44+ super.onActivityCreated(savedInstanceState);
45+
46+ List<OlyCameraSetArrayItem> listItems = new ArrayList<>();
47+
48+ SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
49+ for (int index = 1; index <= IOlyCameraEntryList.MAX_STORE_PROPERTIES; index++)
50+ {
51+ String idHeader = String.format(Locale.ENGLISH, "%03d", index);
52+ String prefDate = preferences.getString(idHeader + IOlyCameraEntryList.DATE_KEY, "");
53+ if (prefDate.length() <= 0)
54+ {
55+ listItems.add(new OlyCameraSetArrayItem(idHeader, "", "", ""));
56+ break; // 最後の1個は空白で出す
57+ //continue; // 全部出す
58+ }
59+ String btName = preferences.getString(idHeader + IOlyCameraEntryList.NAME_KEY, "");
60+ String btCode = preferences.getString(idHeader + IOlyCameraEntryList.CODE_KEY, "");
61+ listItems.add(new OlyCameraSetArrayItem(idHeader, btName, btCode, prefDate));
62+ }
63+ OlyCameraSetArrayAdapter adapter = new OlyCameraSetArrayAdapter(getActivity(), R.layout.column_save_bt, listItems, dialogDismiss);
64+ setListAdapter(adapter);
65+ }
66+
67+ @Override
68+ public void onDestroyView()
69+ {
70+ Log.v(TAG, "onDestroyView()");
71+ super.onDestroyView();
72+ }
73+}
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraPowerOnSelector.java (nonexistent)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraPowerOnSelector.java (revision 423)
@@ -0,0 +1,83 @@
1+package jp.osdn.gokigen.aira01b.olycamerawrapper.ble;
2+
3+import android.support.v7.app.AppCompatActivity;
4+import android.util.Log;
5+
6+import jp.osdn.gokigen.aira01b.ConfirmationDialog;
7+import jp.osdn.gokigen.aira01b.R;
8+import jp.osdn.gokigen.aira01b.preference.ICameraPropertyAccessor;
9+
10+/**
11+ * Olympus AIR の Bluetooth設定を記録する
12+ *
13+ *
14+ */
15+public class OlyCameraPowerOnSelector implements android.support.v7.preference.Preference.OnPreferenceClickListener, ConfirmationDialog.Callback
16+{
17+ private final String TAG = toString();
18+ private final AppCompatActivity context;
19+ //private String preferenceKey = null;
20+
21+ /**
22+ * コンストラクタ
23+ *
24+ */
25+ public OlyCameraPowerOnSelector(AppCompatActivity context)
26+ {
27+ this.context = context;
28+ }
29+
30+ /**
31+ * クラスの準備
32+ *
33+ */
34+ public void prepare()
35+ {
36+ // 何もしない
37+ }
38+
39+ /**
40+ *
41+ *
42+ * @param preference クリックしたpreference
43+ * @return false : ハンドルしない / true : ハンドルした
44+ */
45+ @Override
46+ public boolean onPreferenceClick(android.support.v7.preference.Preference preference)
47+ {
48+ Log.v(TAG, "onPreferenceClick() : ");
49+ if (!preference.hasKey())
50+ {
51+ return (false);
52+ }
53+
54+ String preferenceKey = preference.getKey();
55+ if (preferenceKey.contains(ICameraPropertyAccessor.OLYCAMERA_BLUETOOTH_SETTINGS))
56+ {
57+ try
58+ {
59+ // My Olympus Air登録用ダイアログを表示する
60+ OlyCameraEntryListDialog dialogFragment = OlyCameraEntryListDialog.newInstance(context.getString(R.string.pref_air_bt), context.getString(R.string.pref_summary_air_bt));
61+ dialogFragment.setRetainInstance(false);
62+ dialogFragment.setShowsDialog(true);
63+ dialogFragment.show(context.getSupportFragmentManager(), "dialog");
64+ }
65+ catch (Exception e)
66+ {
67+ e.printStackTrace();
68+ }
69+ return (true);
70+ }
71+ return (false);
72+ }
73+
74+ /**
75+ *
76+ *
77+ */
78+ @Override
79+ public void confirm()
80+ {
81+ Log.v(TAG, "confirm() ");
82+ }
83+}
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayAdapter.java (nonexistent)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayAdapter.java (revision 423)
@@ -0,0 +1,104 @@
1+package jp.osdn.gokigen.aira01b.olycamerawrapper.ble;
2+
3+import android.content.Context;
4+import android.support.annotation.NonNull;
5+import android.util.Log;
6+import android.view.LayoutInflater;
7+import android.view.View;
8+import android.view.ViewGroup;
9+import android.widget.ArrayAdapter;
10+import android.widget.Button;
11+import android.widget.EditText;
12+import android.widget.TextView;
13+import android.widget.Toast;
14+
15+import java.util.List;
16+
17+import jp.osdn.gokigen.aira01b.R;
18+
19+
20+public class OlyCameraSetArrayAdapter extends ArrayAdapter<OlyCameraSetArrayItem>
21+{
22+ private final String TAG = toString();
23+ private final Context context;
24+ private LayoutInflater inflater = null;
25+ private final int textViewResourceId;
26+ private final IOlyCameraSetDialogDismiss dialogDismiss;
27+ private List<OlyCameraSetArrayItem> listItems = null;
28+
29+ OlyCameraSetArrayAdapter(Context context, int textId, List<OlyCameraSetArrayItem> items, IOlyCameraSetDialogDismiss dialogDismiss)
30+ {
31+ super(context, textId, items);
32+
33+ this.context = context;
34+ textViewResourceId = textId;
35+ listItems = items;
36+ this.dialogDismiss = dialogDismiss;
37+
38+ inflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
39+ }
40+
41+ /**
42+ *
43+ */
44+ @Override
45+ public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent)
46+ {
47+ View view;
48+ if(convertView != null)
49+ {
50+ view = convertView;
51+ }
52+ else
53+ {
54+ view = inflater.inflate(textViewResourceId, null);
55+ }
56+
57+ try
58+ {
59+ final OlyCameraSetArrayItem item = listItems.get(position);
60+
61+ final EditText btNameEdit = view.findViewWithTag("bt_name");
62+ btNameEdit.setText(item.getBtName());
63+
64+ final EditText passCodeEdit = view.findViewWithTag("bt_passcode");
65+ passCodeEdit.setText(item.getBtPassCode());
66+
67+ TextView infoView = view.findViewWithTag("info");
68+ infoView.setText(item.getInformation());
69+
70+ Button button = view.findViewWithTag("button");
71+ button.setOnClickListener(new Button.OnClickListener()
72+ {
73+ @Override
74+ public void onClick(View view)
75+ {
76+
77+ String idHeader = item.getDataId();
78+ String btName = btNameEdit.getText().toString();
79+ String btCode = passCodeEdit.getText().toString();
80+ String itemInfo = item.getInformation();
81+
82+ Log.v(TAG, "CLICKED : " + idHeader + " " + btName + " [" + btCode + "] (" + item.getBtName() + " " + itemInfo + ")" );
83+ if (dialogDismiss != null)
84+ {
85+ dialogDismiss.setOlyCameraSet(idHeader, btName, btCode, itemInfo);
86+ }
87+ Log.v(TAG, "REGISTERD CAMERA : " + idHeader + " " + btName);
88+
89+ // Toastで保管したことを通知する
90+ String restoredMessage = context.getString(R.string.saved_my_camera) + btName;
91+ Toast.makeText(context, restoredMessage, Toast.LENGTH_SHORT).show();
92+
93+ }
94+ });
95+ }
96+ catch (Exception e)
97+ {
98+ e.printStackTrace();
99+ }
100+
101+ return (view);
102+ }
103+
104+}
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayItem.java (nonexistent)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayItem.java (revision 423)
@@ -0,0 +1,68 @@
1+package jp.osdn.gokigen.aira01b.olycamerawrapper.ble;
2+
3+class OlyCameraSetArrayItem
4+{
5+ private final String dataId;
6+ private String btName = "";
7+ private String btPassCode = "";
8+ private String information = "";
9+/*
10+ private final String initialBtName;
11+ private final String initialBtPassCode;
12+ private final String initialInformation;
13+*/
14+
15+ OlyCameraSetArrayItem(String dataId, String name, String passCode, String information)
16+ {
17+ this.dataId = dataId;
18+ this.btName = name;
19+ this.btPassCode = passCode;
20+ this.information = information;
21+/*
22+ this.initialBtName = name;
23+ this.initialBtPassCode = passCode;
24+ this.initialInformation = information;
25+*/
26+ }
27+
28+ String getDataId()
29+ {
30+ return (dataId);
31+ }
32+
33+ String getBtName()
34+ {
35+ return (btName);
36+ }
37+
38+ String getBtPassCode()
39+ {
40+ return (btPassCode);
41+ }
42+
43+ String getInformation()
44+ {
45+ return (information);
46+ }
47+
48+/*
49+ void setValue(String btName, String btPassCode, String information)
50+ {
51+ this.btName = btName;
52+ this.btPassCode = btPassCode;
53+ this.information = information;
54+ }
55+
56+ public boolean isChanged()
57+ {
58+ return (!(btName.equals(initialBtName))&&(btPassCode.equals(initialBtPassCode))&&(information.equals(initialInformation)));
59+ }
60+
61+ public void resetValue()
62+ {
63+ this.btName = initialBtName;
64+ this.btPassCode = initialBtPassCode;
65+ this.information = initialInformation;
66+ }
67+*/
68+}
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/PowerOnCamera.java (nonexistent)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/PowerOnCamera.java (revision 423)
@@ -0,0 +1,245 @@
1+package jp.osdn.gokigen.aira01b.olycamerawrapper.ble;
2+
3+import android.app.Activity;
4+import android.bluetooth.BluetoothAdapter;
5+import android.bluetooth.BluetoothDevice;
6+import android.bluetooth.BluetoothManager;
7+import android.content.Context;
8+import android.content.SharedPreferences;
9+import android.os.Build;
10+import android.preference.PreferenceManager;
11+import android.util.Log;
12+import android.widget.Toast;
13+
14+import java.util.ArrayList;
15+import java.util.List;
16+import java.util.Locale;
17+
18+import jp.co.olympus.camerakit.OLYCamera;
19+import jp.osdn.gokigen.aira01b.R;
20+
21+/**
22+ * BLE経由でカメラの電源を入れるクラス
23+ *
24+ */
25+public class PowerOnCamera implements ICameraPowerOn
26+{
27+ private final String TAG = toString();
28+ private final int BLE_SCAN_TIMEOUT_MILLIS = 5 * 1000; // 5秒間
29+ private final int BLE_WAIT_DURATION = 100; // 100ms間隔
30+ private final Activity context;
31+ private final OLYCamera camera;
32+ private List<OlyCameraSetArrayItem> myCameraList;
33+ private BluetoothDevice myBluetoothDevice = null;
34+ private String myBtDevicePassCode = "";
35+
36+ /**
37+ *
38+ */
39+ public PowerOnCamera(Activity context, OLYCamera camera)
40+ {
41+ Log.v(TAG, "PowerOnCamera()");
42+ this.context = context;
43+ this.camera = camera;
44+ setupCameraList();
45+ }
46+
47+ public void wakeup(final PowerOnCameraCallback callback)
48+ {
49+ Log.v(TAG, "PowerOnCamera::wakeup()");
50+
51+ try
52+ {
53+ BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter();
54+ if (!btAdapter.isEnabled()) {
55+ // Bluetoothの設定がOFFだった
56+ Log.v(TAG, "Bluetooth is currently off.");
57+ context.runOnUiThread(new Runnable()
58+ {
59+ @Override
60+ public void run()
61+ {
62+ // Toastで カメラ起動エラーがあったことを通知する
63+ Toast.makeText(context, context.getString(R.string.ble_setting_is_off), Toast.LENGTH_LONG).show();
64+ }
65+ });
66+ callback.wakeupExecuted(false);
67+ return;
68+ }
69+ }
70+ catch (Exception e)
71+ {
72+ e.printStackTrace();
73+ callback.wakeupExecuted(false);
74+ return;
75+ }
76+
77+ final BluetoothManager btMgr;
78+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
79+ {
80+ // BLE のサービスを取得
81+ btMgr = (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE);
82+ if (btMgr == null)
83+ {
84+ // Bluetooth LEのサポートがない場合は、何もしない
85+ Log.v(TAG, "PowerOnCamera::wakeup() NOT SUPPORT BLE...");
86+
87+ // BLEの起動はしなかった...
88+ callback.wakeupExecuted(false);
89+ return;
90+ }
91+ final List<OlyCameraSetArrayItem> deviceList = myCameraList;
92+
93+ // BLE_SCAN_TIMEOUT_MILLIS の間だけBLEのスキャンを実施する
94+ Thread thread = new Thread(new Runnable()
95+ {
96+ @Override
97+ public void run()
98+ {
99+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
100+ {
101+ class bleScanCallback implements BluetoothAdapter.LeScanCallback
102+ {
103+ @Override
104+ public void onLeScan(final BluetoothDevice bluetoothDevice, int i, byte[] bytes)
105+ {
106+ try
107+ {
108+ final String btDeviceName = bluetoothDevice.getName();
109+ // Log.v(TAG, "onLeScan() " + btDeviceName); // BluetoothDevice::getName() でログ出力してくれるので
110+ for (OlyCameraSetArrayItem device : deviceList)
111+ {
112+ final String btName = device.getBtName();
113+ // Log.v(TAG, "onLeScan() [" + btName + "]");
114+ if (btName.equals(btDeviceName))
115+ {
116+ // マイカメラ発見!
117+ // 別スレッドで起動する
118+ myBluetoothDevice = bluetoothDevice;
119+ myBtDevicePassCode = device.getBtPassCode();
120+ break;
121+ }
122+ }
123+ }
124+ catch (Exception e)
125+ {
126+ e.printStackTrace();
127+ }
128+ }
129+ private void reset()
130+ {
131+ try
132+ {
133+ myBluetoothDevice = null;
134+ myBtDevicePassCode = "";
135+ }
136+ catch (Exception e)
137+ {
138+ e.printStackTrace();
139+ }
140+ }
141+ }
142+
143+ bleScanCallback scanCallback = new bleScanCallback();
144+ try
145+ {
146+ // スキャン開始
147+ scanCallback.reset();
148+ BluetoothAdapter adapter = btMgr.getAdapter();
149+ if (!adapter.startLeScan(scanCallback))
150+ {
151+ // Bluetooth LEのスキャンが開始できなかった場合...
152+ Log.v(TAG, "Bluetooth LE SCAN START fail...");
153+ callback.wakeupExecuted(false);
154+ return;
155+ }
156+ Log.v(TAG, "BT SCAN STARTED");
157+ int passed = 0;
158+ while (passed < BLE_SCAN_TIMEOUT_MILLIS)
159+ {
160+ // BLEデバイスが見つかったときは抜ける...
161+ if (myBluetoothDevice != null)
162+ {
163+ break;
164+ }
165+
166+ // BLEのスキャンが終わるまで待つ
167+ Thread.sleep(BLE_WAIT_DURATION);
168+ passed = passed + BLE_WAIT_DURATION;
169+ }
170+ // スキャンを止める
171+ adapter.stopLeScan(scanCallback);
172+ Log.v(TAG, "BT SCAN STOPPED");
173+
174+ if (myBluetoothDevice != null)
175+ {
176+ // カメラの起動
177+ Log.v(TAG, "WAKE UP CAMERA : " + myBluetoothDevice.getName() + " [" + myBluetoothDevice.getAddress() + "]");
178+ camera.setBluetoothDevice(myBluetoothDevice);
179+ camera.setBluetoothPassword(myBtDevicePassCode);
180+ camera.wakeup();
181+ callback.wakeupExecuted(true);
182+ }
183+ else
184+ {
185+ callback.wakeupExecuted(false);
186+ }
187+ }
188+ catch (Exception e)
189+ {
190+ e.printStackTrace();
191+ Log.v(TAG, "Bluetooth LE SCAN EXCEPTION...");
192+ callback.wakeupExecuted(false);
193+
194+ try
195+ {
196+ final String btName = (myBluetoothDevice != null) ? myBluetoothDevice.getName() : "";
197+ context.runOnUiThread(new Runnable()
198+ {
199+ @Override
200+ public void run()
201+ {
202+ // Toastで カメラ起動エラーがあったことを通知する
203+ Toast.makeText(context, context.getString(R.string.launch_fail_via_ble) + btName, Toast.LENGTH_LONG).show();
204+ }
205+ });
206+ }
207+ catch (Exception ee)
208+ {
209+ ee.printStackTrace();
210+ }
211+ }
212+ Log.v(TAG, "Bluetooth LE SCAN STOPPED");
213+ }
214+ }
215+ });
216+ thread.start();
217+ }
218+ }
219+
220+ /**
221+ *
222+ *
223+ */
224+ private void setupCameraList()
225+ {
226+ myCameraList = new ArrayList<>();
227+
228+ SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
229+ for (int index = 1; index <= IOlyCameraEntryList.MAX_STORE_PROPERTIES; index++)
230+ {
231+ String idHeader = String.format(Locale.ENGLISH, "%03d", index);
232+ String prefDate = preferences.getString(idHeader + IOlyCameraEntryList.DATE_KEY, "");
233+ if (prefDate.length() <= 0)
234+ {
235+ // 登録が途中までだったとき
236+ break;
237+ }
238+ String btName = preferences.getString(idHeader + IOlyCameraEntryList.NAME_KEY, "");
239+ String btCode = preferences.getString(idHeader + IOlyCameraEntryList.CODE_KEY, "");
240+ myCameraList.add(new OlyCameraSetArrayItem(idHeader, btName, btCode, prefDate));
241+ }
242+ Log.v(TAG, "setupCameraList() : " + myCameraList.size());
243+ }
244+
245+}
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java (revision 422)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java (revision 423)
@@ -95,6 +95,9 @@
9595 String LOWER_CONTROL_FLICK_SENSITIVITY = "lower_control_sensitivity";
9696 String LOWER_CONTROL_FLICK_SENSITIVITY_DEFAULT_VALUE = "3";
9797
98+ String OLYCAMERA_BLUETOOTH_SETTINGS = "olympus_air_bt";
99+
100+
98101 String SYNCHRONIZE_DATETIME = "synchronize_datetime";
99102
100103 int CHOICE_SPLASH_SCREEN = 10;
--- android/AirA01b/trunk/app/src/main/res/layout/column_save_bt.xml (nonexistent)
+++ android/AirA01b/trunk/app/src/main/res/layout/column_save_bt.xml (revision 423)
@@ -0,0 +1,49 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+ android:layout_width="fill_parent"
4+ android:layout_height="fill_parent"
5+ android:orientation="horizontal"
6+ >
7+<!--
8+ <TextView
9+ android:layout_width="0px"
10+ android:layout_height="0px"
11+ />
12+-->
13+ <TextView xmlns:android="http://schemas.android.com/apk/res/android"
14+ android:layout_width="wrap_content"
15+ android:layout_height="wrap_content"
16+ android:textSize="5pt"
17+ android:tag="id"
18+ />
19+
20+ <Button xmlns:android="http://schemas.android.com/apk/res/android"
21+ android:layout_width="64dp"
22+ android:layout_height="wrap_content"
23+ android:tag="button"
24+ android:text="@string/save_props"
25+ android:textSize="6pt" />
26+ <EditText xmlns:android="http://schemas.android.com/apk/res/android"
27+ android:layout_width="wrap_content"
28+ android:layout_height="wrap_content"
29+ android:hint="@string/hint_save_bt_name"
30+ android:textSize="8pt"
31+ android:tag="bt_name"
32+ />
33+ <EditText xmlns:android="http://schemas.android.com/apk/res/android"
34+ android:layout_width="wrap_content"
35+ android:layout_height="wrap_content"
36+ android:hint="@string/hint_save_bt_passcode"
37+ android:inputType="textPassword"
38+ android:password="true"
39+ android:textSize="8pt"
40+ android:tag="bt_passcode"
41+ />
42+
43+ <TextView xmlns:android="http://schemas.android.com/apk/res/android"
44+ android:layout_width="wrap_content"
45+ android:layout_height="wrap_content"
46+ android:gravity="start|top"
47+ android:tag="info"
48+ android:textSize="4pt" />
49+</LinearLayout>
--- android/AirA01b/trunk/app/src/main/res/layout/dialog_my_camera_entries.xml (nonexistent)
+++ android/AirA01b/trunk/app/src/main/res/layout/dialog_my_camera_entries.xml (revision 423)
@@ -0,0 +1,15 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+android:layout_height="match_parent"
4+android:layout_width="match_parent"
5+android:orientation="vertical"
6+ >
7+ <LinearLayout
8+ android:id="@+id/layout_content"
9+ android:layout_width="match_parent"
10+ android:layout_height="match_parent"
11+ android:orientation="vertical"
12+ android:padding="8sp"
13+ />
14+
15+</LinearLayout>
--- android/AirA01b/trunk/app/src/main/res/values/strings.xml (revision 422)
+++ android/AirA01b/trunk/app/src/main/res/values/strings.xml (revision 423)
@@ -219,5 +219,15 @@
219219 <string name="video_failure">FAILED!</string>
220220 <string name="taking_picture">Shooting</string>
221221 <string name="notify_sequential">OK!</string>
222+
223+ <string name="ble_setting_is_off">Bluetooth is currently off.</string>
224+ <string name="launch_fail_via_ble"> Launch fail. via BLE : </string>
225+
226+
227+ <string name="hint_save_bt_name">Name</string>
228+ <string name="hint_save_bt_passcode">Passcode</string>
229+ <string name="pref_air_bt">Olympus Air Settings</string>
230+ <string name="pref_summary_air_bt">Entry your Olympus Air</string>
231+ <string name="saved_my_camera">Registerd : </string>
222232 </resources>
223233
--- android/AirA01b/trunk/app/src/main/res/values-ja/strings.xml (revision 422)
+++ android/AirA01b/trunk/app/src/main/res/values-ja/strings.xml (revision 423)
@@ -217,4 +217,14 @@
217217 <string name="video_failure">失敗です&#8230;</string>
218218 <string name="taking_picture">撮影中</string>
219219 <string name="notify_sequential">OK!</string>
220+
221+
222+ <string name="ble_setting_is_off">BluetoothがOFFです</string>
223+ <string name="launch_fail_via_ble">Bluetooth経由のカメラ起動に失敗 : </string>
224+
225+ <string name="hint_save_bt_name">名前</string>
226+ <string name="hint_save_bt_passcode">パスコード</string>
227+ <string name="pref_air_bt">OLYMPUS AIR設定</string>
228+ <string name="pref_summary_air_bt">Olympus AIRの設定を登録します。</string>
229+ <string name="saved_my_camera">登録しました : </string>
220230 </resources>
旧リポジトリブラウザで表示